From 93f3a4f14f4dacd58b94c3303d16e1e46548963c Mon Sep 17 00:00:00 2001 From: poikilos <7557867+poikilos@users.noreply.github.com> Date: Tue, 5 Feb 2019 14:07:33 -0500 Subject: [PATCH] revert to command -v due to potential issues with "which" (see https://stackoverflow.com/questions/592620/how-to-check-if-a-program-exists-from-a-bash-script) --- install-minetestserver-git-all-backends.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install-minetestserver-git-all-backends.sh b/install-minetestserver-git-all-backends.sh index 47d1d4b..40b22c2 100755 --- a/install-minetestserver-git-all-backends.sh +++ b/install-minetestserver-git-all-backends.sh @@ -37,7 +37,7 @@ sleep 1 echo "1..." sleep 1 echo -if [ `which apt` ]; then +if [ -f "`command -v apt`" ]; then sudo apt -y remove minetest-server sudo apt -y remove minetest sudo apt -y install libncurses5-dev libgettextpo-dev doxygen libspatialindex-dev libpq-dev postgresql-server-dev-all @@ -59,14 +59,14 @@ if [ `which apt` ]; then # Debian: sudo apt -y install libpng-dev libjpeg-dev -elif [ `which pacman` ]; then +elif [ -f "`command -v pacman`" ]; then sudo pacman -R --noconfirm minetest-server sudo pacman -R --noconfirm minetest echo "detected arch-based distro (tested only on antergos)..." # NOTE: the regular packages include headers on arch-based distros: sudo pacman -Syyu --noconfirm git spatialindex postgresql-libs doxygen postgresql-libs hiredis redis irrlicht gettext freetype2 bzip2 libpng libjpeg-turbo libxxf86vm mesa glu sqlite libogg libvorbis openal curl luajit leveldb ncurses redis hiredis gmp #can't find equivalent to libjpeg8-dev libxxf86vm-dev mesa sqlite libogg vorbis -elif [ `which dnf` ]; then +elif [ -f "`command -v dnf`" ]; then sudo dnf -y remove minetest-server sudo dnf -y remove minetest #see poikilos post at https://forum.minetest.net/viewtopic.php?f=42&t=3837&start=125