vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse source 
fixes #1027

See merge request redox-os/redox!1200
This commit is contained in:
Jeremy Soller 2018-10-30 09:40:32 +00:00
parent 3e3576800b adebf2b38e
commit 171a7e8526
1 changed files with 12 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
bootstrap.sh
View file

@ -142,35 +142,18 @@ osx_homebrew()
archLinux() archLinux()
{ {
echo "Detected Arch Linux" echo "Detected Arch Linux"
packages="cmake fuse git gperf perl-html-parser nasm wget"
if [ "$1" == "qemu" ]; then
packages="$packages qemu"
elif [ "$1" == "virtualbox" ]; then
packages="$packages virtualbox"
fi
echo "Updating system..." echo "Updating system..."
sudo pacman -Syu sudo pacman -Syu
if [ -z "$(which nasm)" ]; then echo "Installing packages $packages..."
echo "Installing nasm..." sudo pacman -S --needed $packages
sudo pacman -S nasm
fi
if [ -z "$(which git)" ]; then
echo "Installing git..."
sudo pacman -S git
fi
if [ "$1" == "qemu" ]; then
if [ -z "$(which qemu-system-x86_64)" ]; then
echo "Installing QEMU..."
sudo pacman -S qemu
else
echo "QEMU already installed!"
fi
fi
echo "Installing fuse..."
sudo pacman -S --needed fuse
if [ -z "$(which cmake)" ]; then
echo "Installing cmake..."
sudo pacman -S cmake
fi
} }
############################################################################### ###############################################################################