Do not assume FHS in scripts

diseraluca-qt · diseraluca-qt · commit 3388de698bfb · 2024-06-25T11:44:00.000+02:00
On systems that do not follow the Filesystem Hierarchy Standard, such as
guix, the hardcoded `/bin/pwd` will fail to be found so that the script
will fail.

Use `pwd`, instead, so that the command can be found through the normal
path search mechanism.

Change-Id: Ib5480aeda5ca9d241286be6d1f95e9a0810476a8
Reviewed-by: Joerg Bornemann &lt;joerg.bornemann@qt.io&gt;
diff --git a/bin/qmake-and-qtpaths-wrapper.in b/bin/qmake-and-qtpaths-wrapper.in
@@ -2,6 +2,6 @@
 
 # The directory of this script is the expanded absolute path of the "$qt_prefix/bin" directory.
 script_dir_path=`dirname $0`
-script_dir_path=`(cd "$script_dir_path"; /bin/pwd)`
+script_dir_path=`(cd "$script_dir_path"; pwd)`
 
 @host_qt_bindir@/@tool_name@@tool_version@ -qtconf "$script_dir_path/target_qt.conf" $*
diff --git a/bin/qt-cmake-create.in b/bin/qt-cmake-create.in
@@ -5,7 +5,7 @@ HELP_MESSAGE="Usage
 
 # The directory of this script is the expanded absolute path of the "$qt_prefix/bin" directory.
 script_dir_path=`dirname $0`
-script_dir_path=`(cd "$script_dir_path"; /bin/pwd)`
+script_dir_path=`(cd "$script_dir_path"; pwd)`
 
 # Try to use original cmake, otherwise to make it relocatable, use any cmake found in PATH.
 original_cmake_path="@CMAKE_COMMAND@"
diff --git a/bin/qt-cmake.in b/bin/qt-cmake.in
@@ -2,7 +2,7 @@
 
 # The directory of this script is the expanded absolute path of the "$qt_prefix/bin" directory.
 script_dir_path=`dirname $0`
-script_dir_path=`(cd "$script_dir_path"; /bin/pwd)`
+script_dir_path=`(cd "$script_dir_path"; pwd)`
 
 # Try to use original cmake, otherwise to make it relocatable, use any cmake found in PATH.
 original_cmake_path="@CMAKE_COMMAND@"
diff --git a/bin/qt-configure-module.in b/bin/qt-configure-module.in
@@ -2,7 +2,7 @@
 set -eu
 
 script_dir_path=`dirname $0`
-script_dir_path=`(cd "$script_dir_path"; /bin/pwd)`
+script_dir_path=`(cd "$script_dir_path"; pwd)`
 
 printUsage()
 {
diff --git a/configure b/configure
@@ -9,9 +9,9 @@
 
 # the directory of this script is the "source tree"
 relpath=`dirname "$0"`
-relpath=`(cd "$relpath"; /bin/pwd)`
+relpath=`(cd "$relpath"; pwd)`
 # the current directory is the "build tree" or "object tree"
-outpath=`/bin/pwd`
+outpath=`pwd`
 outpathPrefix=$outpath
 
 # do this early so we don't store it in config.status
diff --git a/libexec/qt-internal-configure-examples.in b/libexec/qt-internal-configure-examples.in
@@ -1,5 +1,5 @@
 #!/bin/sh
 script_dir_path=`dirname $0`
-script_dir_path=`(cd "$script_dir_path"; /bin/pwd)`
+script_dir_path=`(cd "$script_dir_path"; pwd)`
 
 "$script_dir_path/@relative_path_from_libexec_dir_to_bin_dir@/qt-cmake" @script_passed_args@ "$@"
diff --git a/libexec/qt-internal-configure-tests.in b/libexec/qt-internal-configure-tests.in
@@ -1,5 +1,5 @@
 #!/bin/sh
 script_dir_path=`dirname $0`
-script_dir_path=`(cd "$script_dir_path"; /bin/pwd)`
+script_dir_path=`(cd "$script_dir_path"; pwd)`
 
 "$script_dir_path/@relative_path_from_libexec_dir_to_bin_dir@/qt-cmake" @script_passed_args@ "$@"

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`set -eu`
`3`	`3`
`4`	`4`	script_dir_path=`dirname $0`
`5`		-script_dir_path=`(cd "$script_dir_path"; /bin/pwd)`
	`5`	+script_dir_path=`(cd "$script_dir_path"; pwd)`
`6`	`6`
`7`	`7`	`printUsage()`
`8`	`8`	`{`