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

Merge branch 'fix-bootstrap-arch' into 'master'

Browse source 
Fix: Add rsync to dependent package list (Arch)

See merge request redox-os/redox!1441
This commit is contained in:
Jeremy Soller 2024-05-08 13:47:06 +00:00
parent 04a03b93ee 17bedf539f
commit 27fffe98fc
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
bootstrap.sh
View file

@ -350,7 +350,8 @@ archLinux()
doxygen \ doxygen \
lua \ lua \
ant \ ant \
protobuf" protobuf \
rsync"
if [ "$1" == "qemu" ]; then if [ "$1" == "qemu" ]; then
packages="$packages qemu" packages="$packages qemu"
@ -526,7 +527,7 @@ fedora()
echo "Unknown emulator: $1" echo "Unknown emulator: $1"
exit 1 exit 1
fi fi
# Use rpm -q <package> to check if it's already installed # Use rpm -q <package> to check if it's already installed
PKGS=$(for pkg in file \ PKGS=$(for pkg in file \
autoconf \ autoconf \
@ -668,13 +669,13 @@ suse()
echo "Unknown emulator: $1" echo "Unknown emulator: $1"
exit 1 exit 1
fi fi
echo "Installing necessary build tools..." echo "Installing necessary build tools..."
# We could install all the packages in a single zypper command with: # We could install all the packages in a single zypper command with:
# #
# zypper install package1 package2 package3 # zypper install package1 package2 package3
# #
# But there is an issue with this: zypper returns a success code if at # But there is an issue with this: zypper returns a success code if at
# least one of the packages was correctly installed, but we need it to fail # least one of the packages was correctly installed, but we need it to fail
# if any of the packages is missing. # if any of the packages is missing.
@ -687,14 +688,14 @@ suse()
if rpm -q "${p}" > /dev/null ; then if rpm -q "${p}" > /dev/null ; then
echo "${p} is already installed" echo "${p} is already installed"
else else
# Zypper shows a confirmation prompt and the "y" answer even with # Zypper shows a confirmation prompt and the "y" answer even with
# --non-interactive and --no-confirm: # --non-interactive and --no-confirm:
# #
# 1 new package to install. # 1 new package to install.
# Overall download size: 281.7 KiB. Already cached: 0 B. After the operation, additional 394.6 KiB will be used. # Overall download size: 281.7 KiB. Already cached: 0 B. After the operation, additional 394.6 KiB will be used.
# Continue? [y/n/v/...? shows all options] (y): y # Continue? [y/n/v/...? shows all options] (y): y
# #
# That could make the user think that the package was installed, # That could make the user think that the package was installed,
# when it was only a dry run. # when it was only a dry run.
# To avoid the confusion, we hide the output unless there was an # To avoid the confusion, we hide the output unless there was an
# error. # error.