Compare commits

..

No commits in common. "8319d0c780141f054febe0a0b777b843633198ca" and "da3559b7063aa1d82c654c97b5533058f494b7f3" have entirely different histories.

1 changed files with 5 additions and 18 deletions

View File

@ -149,12 +149,8 @@ archLinux()
packages="$packages virtualbox"
fi
# Scripts should not cause a system update in order to just install a couple
# of packages. If pacman -S --needed is going to fail, let it fail and the
# user will figure out the issues (without updating if required) and rerun
# the script.
#echo "Updating system..."
#sudo pacman -Syu
echo "Updating system..."
sudo pacman -Syu
echo "Installing packages $packages..."
sudo pacman -S --needed $packages
@ -518,27 +514,16 @@ fi
emulator="qemu"
defpackman="apt-get"
dependenciesonly=false
update=false
while getopts ":e:p:udhs" opt
while getopts ":e:p:d" opt
do
case "$opt" in
e) emulator="$OPTARG";;
p) defpackman="$OPTARG";;
d) dependenciesonly=true;;
u) update=true;;
h) usage;;
s) statusCheck && exit;;
\?) echo "I don't know what to do with that option, try -h for help"; exit;;
esac
done
if [ "$update" == "true" ]; then
git pull upstream master
git submodule update --recursive --init
rustup update nightly
exit
fi
banner
if [ "Darwin" == "$(uname -s)" ]; then
osx "$emulator"
@ -564,6 +549,8 @@ else
elif hash 2>/dev/null pacman; then
archLinux "$emulator"
fi
fi
if [ "$dependenciesonly" = false ]; then