BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Replace uses of which(1) with command -v

Browse Source
This commit is contained in:
sfan5 2021-10-25 21:56:25 +02:00 committed by rubenwardy
parent 4114e3047b
commit ea1396f856
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/gradlew vendored
View File

@ -98,7 +98,7 @@ location of your Java installation."
fi fi
else else
JAVACMD="java" JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. command -v java >/dev/null || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the Please set the JAVA_HOME variable in your environment to match the
location of your Java installation." location of your Java installation."

6
util/buildbot/buildwin32.sh
View File

@ -19,9 +19,9 @@ builddir="$( cd "$builddir" && pwd )"
libdir=$builddir/libs libdir=$builddir/libs
# Test which win32 compiler is present # 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 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 toolchain_file=$dir/toolchain_i686-w64-mingw32-posix.cmake
if [ -z "$toolchain_file" ]; then if [ -z "$toolchain_file" ]; then
@ -146,7 +146,7 @@ cmake -S $sourcedir -B . \
-DCURL_INCLUDE_DIR=$libdir/curl/include \ -DCURL_INCLUDE_DIR=$libdir/curl/include \
-DCURL_LIBRARY=$libdir/curl/lib/libcurl.dll.a \ -DCURL_LIBRARY=$libdir/curl/lib/libcurl.dll.a \
\ \
-DGETTEXT_MSGFMT=`which msgfmt` \ -DGETTEXT_MSGFMT=`command -v msgfmt` \
-DGETTEXT_DLL="$gettext_dlls" \ -DGETTEXT_DLL="$gettext_dlls" \
-DGETTEXT_INCLUDE_DIR=$libdir/gettext/include \ -DGETTEXT_INCLUDE_DIR=$libdir/gettext/include \
-DGETTEXT_LIBRARY=$libdir/gettext/lib/libintl.dll.a \ -DGETTEXT_LIBRARY=$libdir/gettext/lib/libintl.dll.a \

6
util/buildbot/buildwin64.sh
View File

@ -19,9 +19,9 @@ builddir="$( cd "$builddir" && pwd )"
libdir=$builddir/libs libdir=$builddir/libs
# Test which win64 compiler is present # 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 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 toolchain_file=$dir/toolchain_x86_64-w64-mingw32-posix.cmake
if [ -z "$toolchain_file" ]; then if [ -z "$toolchain_file" ]; then
@ -146,7 +146,7 @@ cmake -S $sourcedir -B . \
-DCURL_INCLUDE_DIR=$libdir/curl/include \ -DCURL_INCLUDE_DIR=$libdir/curl/include \
-DCURL_LIBRARY=$libdir/curl/lib/libcurl.dll.a \ -DCURL_LIBRARY=$libdir/curl/lib/libcurl.dll.a \
\ \
-DGETTEXT_MSGFMT=`which msgfmt` \ -DGETTEXT_MSGFMT=`command -v msgfmt` \
-DGETTEXT_DLL="$gettext_dlls" \ -DGETTEXT_DLL="$gettext_dlls" \
-DGETTEXT_INCLUDE_DIR=$libdir/gettext/include \ -DGETTEXT_INCLUDE_DIR=$libdir/gettext/include \
-DGETTEXT_LIBRARY=$libdir/gettext/lib/libintl.dll.a \ -DGETTEXT_LIBRARY=$libdir/gettext/lib/libintl.dll.a \

2
util/updatepo.sh
View File

@ -13,7 +13,7 @@ abort() {
# this script is. Relative paths are fine for us so we can just # this script is. Relative paths are fine for us so we can just
# use the following trick (works both for manual invocations and for # use the following trick (works both for manual invocations and for
# script found from PATH) # 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 # The script is executed from the parent of po/, which is also the
# parent of the script directory and of the src/ directory. # parent of the script directory and of the src/ directory.