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

Merge branch 'mggmuggins/fix_bootstrap_final' into 'master'

Browse source 
Remove pacman upgrade; Cli options

See merge request redox-os/redox!1223
This commit is contained in:
Jeremy Soller 2019-10-27 18:59:52 +00:00
parent da3559b706 ecd30e03f8
commit 8319d0c780
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
bootstrap.sh
View file

@ -149,8 +149,12 @@ archLinux()
packages="$packages virtualbox" packages="$packages virtualbox"
fi fi
echo "Updating system..." # Scripts should not cause a system update in order to just install a couple
sudo pacman -Syu # 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 "Installing packages $packages..." echo "Installing packages $packages..."
sudo pacman -S --needed $packages sudo pacman -S --needed $packages
@ -514,16 +518,27 @@ fi
emulator="qemu" emulator="qemu"
defpackman="apt-get" defpackman="apt-get"
dependenciesonly=false dependenciesonly=false
while getopts ":e:p:d" opt update=false
while getopts ":e:p:udhs" opt
do do
case "$opt" in case "$opt" in
e) emulator="$OPTARG";; e) emulator="$OPTARG";;
p) defpackman="$OPTARG";; p) defpackman="$OPTARG";;
d) dependenciesonly=true;; 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;; \?) echo "I don't know what to do with that option, try -h for help"; exit;;
esac esac
done done
if [ "$update" == "true" ]; then
git pull upstream master
git submodule update --recursive --init
rustup update nightly
exit
fi
banner banner
if [ "Darwin" == "$(uname -s)" ]; then if [ "Darwin" == "$(uname -s)" ]; then
osx "$emulator" osx "$emulator"
@ -549,8 +564,6 @@ else
elif hash 2>/dev/null pacman; then elif hash 2>/dev/null pacman; then
archLinux "$emulator" archLinux "$emulator"
fi fi
fi fi
if [ "$dependenciesonly" = false ]; then if [ "$dependenciesonly" = false ]; then