parent
							
								
									03f989b2c2
								
							
						
					
					
						commit
						92d9658a74
					
				
					 1 changed files with 5 additions and 5 deletions
				
			
		
							
								
								
									
										10
									
								
								bootstrap.sh
									
										
									
									
									
								
							
							
						
						
									
										10
									
								
								bootstrap.sh
									
										
									
									
									
								
							| 
						 | 
					@ -134,19 +134,19 @@ fedora()
 | 
				
			||||||
	echo "Detected Fedora"
 | 
						echo "Detected Fedora"
 | 
				
			||||||
	if [ -z "$(which git)" ]; then
 | 
						if [ -z "$(which git)" ]; then
 | 
				
			||||||
		echo "Installing git..."
 | 
							echo "Installing git..."
 | 
				
			||||||
		sudo dnf install git-all
 | 
							sudo yum install git-all
 | 
				
			||||||
	fi
 | 
						fi
 | 
				
			||||||
	if [ "$1" == "qemu" ]; then
 | 
						if [ "$1" == "qemu" ]; then
 | 
				
			||||||
		if [ -z "$(which qemu-system-i386)" ]; then
 | 
							if [ -z "$(which qemu-system-i386)" ]; then
 | 
				
			||||||
			echo "Installing QEMU..."
 | 
								echo "Installing QEMU..."
 | 
				
			||||||
			sudo dnf install qemu-system-x86 qemu-kvm
 | 
								sudo yum install qemu-system-x86 qemu-kvm
 | 
				
			||||||
		else
 | 
							else
 | 
				
			||||||
			echo "QEMU already installed!"
 | 
								echo "QEMU already installed!"
 | 
				
			||||||
		fi
 | 
							fi
 | 
				
			||||||
	else
 | 
						else
 | 
				
			||||||
		if [ -z "$(which virtualbox)" ]; then
 | 
							if [ -z "$(which virtualbox)" ]; then
 | 
				
			||||||
			echo "Installing virtualbox..."
 | 
								echo "Installing virtualbox..."
 | 
				
			||||||
			sudo dnf install virtualbox
 | 
								sudo yum install virtualbox
 | 
				
			||||||
		else
 | 
							else
 | 
				
			||||||
			echo "Virtualbox already installed!"
 | 
								echo "Virtualbox already installed!"
 | 
				
			||||||
		fi
 | 
							fi
 | 
				
			||||||
| 
						 | 
					@ -282,7 +282,7 @@ usage()
 | 
				
			||||||
####################################################################################
 | 
					####################################################################################
 | 
				
			||||||
rustInstall() {
 | 
					rustInstall() {
 | 
				
			||||||
	# Check to see if multirust is installed, we don't want it messing with rustup
 | 
						# Check to see if multirust is installed, we don't want it messing with rustup
 | 
				
			||||||
	# In th future we can probably remove this but I believe it's good to have for now	
 | 
						# In the future we can probably remove this but I believe it's good to have for now
 | 
				
			||||||
	if [ -e /usr/local/lib/rustlib/uninstall.sh ] ; then
 | 
						if [ -e /usr/local/lib/rustlib/uninstall.sh ] ; then
 | 
				
			||||||
		echo "It appears that multirust is installed on your system."
 | 
							echo "It appears that multirust is installed on your system."
 | 
				
			||||||
		echo "This tool has been deprecated by the maintainer, and will cause issues."
 | 
							echo "This tool has been deprecated by the maintainer, and will cause issues."
 | 
				
			||||||
| 
						 | 
					@ -439,7 +439,7 @@ else
 | 
				
			||||||
		ubuntu "$emulator" "$defpackman"
 | 
							ubuntu "$emulator" "$defpackman"
 | 
				
			||||||
	fi
 | 
						fi
 | 
				
			||||||
	# Fedora
 | 
						# Fedora
 | 
				
			||||||
	if hash 2>/dev/null dnf; then
 | 
						if hash 2>/dev/null yum; then
 | 
				
			||||||
		fedora "$emulator"
 | 
							fedora "$emulator"
 | 
				
			||||||
	fi
 | 
						fi
 | 
				
			||||||
	# Suse and derivatives
 | 
						# Suse and derivatives
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue