From ea1396f85693ee1f752219d91adcacb32041fc84 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Mon, 25 Oct 2021 21:56:25 +0200
Subject: Replace uses of which(1) with command -v

---
 util/buildbot/buildwin32.sh | 6 +++---
 util/buildbot/buildwin64.sh | 6 +++---
 util/updatepo.sh            | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'util')

diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh
index eceb5b788..c1edbfa1f 100755
--- a/util/buildbot/buildwin32.sh
+++ b/util/buildbot/buildwin32.sh
@@ -19,9 +19,9 @@ builddir="$( cd "$builddir" && pwd )"
 libdir=$builddir/libs
 
 # Test which win32 compiler is present
-which i686-w64-mingw32-gcc &>/dev/null &&
+command -v i686-w64-mingw32-gcc >/dev/null &&
 	toolchain_file=$dir/toolchain_i686-w64-mingw32.cmake
-which i686-w64-mingw32-gcc-posix &>/dev/null &&
+command -v i686-w64-mingw32-gcc-posix >/dev/null &&
 	toolchain_file=$dir/toolchain_i686-w64-mingw32-posix.cmake
 
 if [ -z "$toolchain_file" ]; then
@@ -146,7 +146,7 @@ cmake -S $sourcedir -B . \
 	-DCURL_INCLUDE_DIR=$libdir/curl/include \
 	-DCURL_LIBRARY=$libdir/curl/lib/libcurl.dll.a \
 	\
-	-DGETTEXT_MSGFMT=`which msgfmt` \
+	-DGETTEXT_MSGFMT=`command -v msgfmt` \
 	-DGETTEXT_DLL="$gettext_dlls" \
 	-DGETTEXT_INCLUDE_DIR=$libdir/gettext/include \
 	-DGETTEXT_LIBRARY=$libdir/gettext/lib/libintl.dll.a \
diff --git a/util/buildbot/buildwin64.sh b/util/buildbot/buildwin64.sh
index 68d2ebf0c..134bc08de 100755
--- a/util/buildbot/buildwin64.sh
+++ b/util/buildbot/buildwin64.sh
@@ -19,9 +19,9 @@ builddir="$( cd "$builddir" && pwd )"
 libdir=$builddir/libs
 
 # Test which win64 compiler is present
-which x86_64-w64-mingw32-gcc &>/dev/null &&
+command -v x86_64-w64-mingw32-gcc >/dev/null &&
 	toolchain_file=$dir/toolchain_x86_64-w64-mingw32.cmake
-which x86_64-w64-mingw32-gcc-posix &>/dev/null &&
+command -v x86_64-w64-mingw32-gcc-posix >/dev/null &&
 	toolchain_file=$dir/toolchain_x86_64-w64-mingw32-posix.cmake
 
 if [ -z "$toolchain_file" ]; then
@@ -146,7 +146,7 @@ cmake -S $sourcedir -B . \
 	-DCURL_INCLUDE_DIR=$libdir/curl/include \
 	-DCURL_LIBRARY=$libdir/curl/lib/libcurl.dll.a \
 	\
-	-DGETTEXT_MSGFMT=`which msgfmt` \
+	-DGETTEXT_MSGFMT=`command -v msgfmt` \
 	-DGETTEXT_DLL="$gettext_dlls" \
 	-DGETTEXT_INCLUDE_DIR=$libdir/gettext/include \
 	-DGETTEXT_LIBRARY=$libdir/gettext/lib/libintl.dll.a \
diff --git a/util/updatepo.sh b/util/updatepo.sh
index dbcb16fde..070a44be6 100755
--- a/util/updatepo.sh
+++ b/util/updatepo.sh
@@ -13,7 +13,7 @@ abort() {
 # this script is. Relative paths are fine for us so we can just
 # use the following trick (works both for manual invocations and for
 # script found from PATH)
-scriptisin="$(dirname "$(which "$0")")"
+scriptisin="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # The script is executed from the parent of po/, which is also the
 # parent of the script directory and of the src/ directory.
-- 
cgit v1.2.3