bootstrap: use a proper dependency test for Arch

`pacman -T` exists for this exact purpose; it respects provides without
having to manually code them into the script.
This commit is contained in:
Mantas Mikulėnas
2015-10-30 17:11:55 +02:00
parent c8999f86a1
commit 724d06eec5
+20 -22
View File
@@ -1,29 +1,27 @@
#!/bin/sh #!/bin/sh
# Tested with: # Tested with:
# - Manjaro 15.09 (x86_64)
# - ArchLinux (x86_64) # - ArchLinux (x86_64)
#
# Both "gcc-multilib" and "gcc" packages provide gcc. If user already has
# "gcc-multilib" installed, let's stick to their choice
if pacman -Qc gcc-multilib &>/dev/null
then
GCC_PACKAGE="gcc-multilib";
else
GCC_PACKAGE="gcc";
fi
# "python-virtualenv" is Python3, but "python2-virtualenv" provides # "python-virtualenv" is Python3, but "python2-virtualenv" provides
# only "virtualenv2" binary, not "virtualenv" necessary in # only "virtualenv2" binary, not "virtualenv" necessary in
# ./bootstrap/dev/_common_venv.sh # ./bootstrap/dev/_common_venv.sh
pacman -S --needed \
git \ deps="
python2 \ git
python-virtualenv \ python2
"$GCC_PACKAGE" \ python-virtualenv
dialog \ gcc
augeas \ dialog
openssl \ augeas
libffi \ openssl
ca-certificates \ libffi
pkg-config \ ca-certificates
pkg-config
"
missing=$(pacman -T $deps)
if [ "$missing" ]; then
pacman -S --needed $missing
fi