[infra] Discard output from the cd command when followed by pwd

arkq · arkq · commit e739421b4eb0 · 2025-10-24T12:25:19.000+02:00
This commits fixes the issue when `cd` is followed by the `pwd` in a
bash one-liner which should get the directory in which the executed
script is located. The problem with such approach is that the `cd`
command can print the destination directory in case when one has the
CDPATH environmental variable set.

From the `man bash`:

&gt; cd [-L|...] [dir]
&gt;   Change the current directory to dir. [...] If a non-empty directory
&gt;   name from CDPATH is used the absolute pathname of the new working
&gt;   directory is written to the standard output.

ONE-DCO-1.0-Signed-off-by: Arkadiusz Bokowy &lt;a.bokowy@samsung.com&gt;
diff --git a/infra/packaging/build b/infra/packaging/build
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
 
 if [[ -z "${NNAS_PROJECT_PATH}" ]]; then
   echo "ERROR: NNAS_PROJECT_PATH is not specified"
diff --git a/infra/packaging/res/tf2nnpkg b/infra/packaging/res/tf2nnpkg
@@ -2,7 +2,7 @@
 
 set -e
 
-ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." >/dev/null && pwd)"
 
 command_exists() {
   if [ "$#" -le 0 ]; then
diff --git a/infra/packaging/res/tf2nnpkg.20191215 b/infra/packaging/res/tf2nnpkg.20191215
@@ -2,7 +2,7 @@
 
 set -e
 
-ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." >/dev/null && pwd)"
 
 command_exists() {
   if [ "$#" -le 0 ]; then
diff --git a/infra/packaging/res/tf2nnpkg.20200220 b/infra/packaging/res/tf2nnpkg.20200220
@@ -2,7 +2,7 @@
 
 set -e
 
-ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." >/dev/null && pwd)"
 
 command_exists() {
   if [ "$#" -le 0 ]; then
diff --git a/infra/packaging/res/tf2nnpkg.20200508 b/infra/packaging/res/tf2nnpkg.20200508
@@ -2,7 +2,7 @@
 
 set -e
 
-ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." >/dev/null && pwd)"
 
 command_exists() {
   if [ "$#" -le 0 ]; then
diff --git a/infra/packaging/res/tf2nnpkg.20200616 b/infra/packaging/res/tf2nnpkg.20200616
@@ -2,7 +2,7 @@
 
 set -e
 
-ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." >/dev/null && pwd)"
 
 command_exists() {
   if [ "$#" -le 0 ]; then
diff --git a/infra/packaging/res/tf2nnpkg.20200630 b/infra/packaging/res/tf2nnpkg.20200630
@@ -2,7 +2,7 @@
 
 set -e
 
-ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." >/dev/null && pwd)"
 
 command_exists() {
   if [ "$#" -le 0 ]; then
diff --git a/infra/packaging/res/tf2nnpkg.20210406 b/infra/packaging/res/tf2nnpkg.20210406
@@ -2,7 +2,7 @@
 
 set -e
 
-ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." >/dev/null && pwd)"
 
 command_exists() {
   if [ "$#" -le 0 ]; then
diff --git a/infra/packaging/res/tf2nnpkg.20210706 b/infra/packaging/res/tf2nnpkg.20210706
@@ -2,7 +2,7 @@
 
 set -e
 
-ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." >/dev/null && pwd)"
 
 command_exists() {
   if [ "$#" -le 0 ]; then
diff --git a/infra/packaging/res/tf2nnpkg.20210910 b/infra/packaging/res/tf2nnpkg.20210910
@@ -2,7 +2,7 @@
 
 set -e
 
-ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." >/dev/null && pwd)"
 
 command_exists() {
   if [ "$#" -le 0 ]; then
diff --git a/infra/packaging/res/tf2nnpkg.20220323 b/infra/packaging/res/tf2nnpkg.20220323
@@ -2,7 +2,7 @@
 
 set -e
 
-ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." >/dev/null && pwd)"
 
 command_exists() {
   if [ "$#" -le 0 ]; then
diff --git a/infra/packaging/res/tf2nnpkg.20221125 b/infra/packaging/res/tf2nnpkg.20221125
@@ -2,7 +2,7 @@
 
 set -e
 
-ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." >/dev/null && pwd)"
 
 command_exists() {
   if [ "$#" -le 0 ]; then
diff --git a/infra/packaging/res/tf2nnpkg.20230413 b/infra/packaging/res/tf2nnpkg.20230413
@@ -2,7 +2,7 @@
 
 set -e
 
-ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." >/dev/null && pwd)"
 
 command_exists() {
   if [ "$#" -le 0 ]; then
diff --git a/infra/packaging/res/tf2nnpkg.20230907 b/infra/packaging/res/tf2nnpkg.20230907
@@ -2,7 +2,7 @@
 
 set -e
 
-ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." >/dev/null && pwd)"
 
 command_exists() {
   if [ "$#" -le 0 ]; then
diff --git a/infra/packaging/verify b/infra/packaging/verify
@@ -7,7 +7,7 @@
 #
 # REQUIRE: N >= 1
 #
-SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
 
 if [[ -z "${NNAS_PROJECT_PATH}" ]]; then
   echo "ERROR: NNAS_PROJECT_PATH is not specified"
diff --git a/infra/scripts/common.sh b/infra/scripts/common.sh
@@ -21,8 +21,8 @@
 # NNPackageTest $1 $2
 #   Run [INSTALL_PATH]/test/onert-test nnpkg-test command
 
-CURRENT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-ROOT_PATH="$(cd ${CURRENT_PATH}/../../ && pwd)"
+CURRENT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
+ROOT_PATH="$(cd ${CURRENT_PATH}/../../ >/dev/null && pwd)"
 
 # Install path on CI
 INSTALL_PATH=$ROOT_PATH/Product/out
diff --git a/infra/scripts/configure_collect_nnpkgs.sh b/infra/scripts/configure_collect_nnpkgs.sh
@@ -4,7 +4,7 @@
 
 set -eo pipefail
 
-CURRENT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+CURRENT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
 ROOT_PATH="$CURRENT_PATH/../../"
 
 source ${CURRENT_PATH}/compiler_modules.sh
diff --git a/infra/scripts/configure_compiler_coverage.sh b/infra/scripts/configure_compiler_coverage.sh
@@ -4,7 +4,7 @@
 
 set -eo pipefail
 
-CURRENT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+CURRENT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
 ROOT_PATH="$CURRENT_PATH/../../"
 
 source ${CURRENT_PATH}/compiler_modules.sh
diff --git a/infra/scripts/tizen_xu4_test.sh b/infra/scripts/tizen_xu4_test.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+SCRIPT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 HOST_HOME=$SCRIPT_ROOT/../..
 if [ -z "$TEST_ROOT" ]; then
     TEST_ROOT=/opt/usr/nnfw-test
@@ -127,7 +127,7 @@ SDB_CMD="sdb -s $SERIAL "
 $SDB_CMD root on
 $SDB_CMD shell mount -o rw,remount /
 
-SCRIPT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+SCRIPT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 ROOT=$SCRIPT_ROOT/../
 
 if [ -z "$RPM_DIR" ] && [ -z "$TEST_SUITE_PATH" ]; then
diff --git a/infra/scripts/unittest_compiler_xml.sh b/infra/scripts/unittest_compiler_xml.sh
@@ -4,7 +4,7 @@
 
 set -eo pipefail
 
-CURRENT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+CURRENT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
 ROOT_PATH="$CURRENT_PATH/../../"
 NNCC_WORKSPACE=${NNCC_WORKSPACE:-${ROOT_PATH}build}
 
diff --git a/nnas b/nnas
@@ -2,13 +2,15 @@
 
 NNAS_CONFIG_RPATH="infra/config"
 NNAS_COMMAND_RPATH="infra/command"
-NNAS_PROJECT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+NNAS_PROJECT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
+NNAS_COMMAND_PATH="${NNAS_PROJECT_PATH}/${NNAS_COMMAND_RPATH}"
 
 function Usage()
 {
   echo "Usage: $0 [COMMAND] ..."
   echo "Command:"
-  for file in "$NNAS_COMMAND_RPATH"/*;
+  for file in "$NNAS_COMMAND_PATH"/*;
   do
     echo "  $(basename "$file")"
   done
@@ -26,7 +28,7 @@ if [[ -z "${COMMAND}" ]]; then
   exit 255
 fi
 
-COMMAND_FILE="${NNAS_PROJECT_PATH}/${NNAS_COMMAND_RPATH}/${COMMAND}"
+COMMAND_FILE="${NNAS_COMMAND_PATH}/${COMMAND}"
 
 if [[ ! -f "${COMMAND_FILE}" ]]; then
   echo "ERROR: '${COMMAND}' is not supported"
diff --git a/nncc b/nncc
@@ -3,14 +3,15 @@
 NNCC_SCRIPT_RPATH="scripts"
 NNCC_COMMAND_RPATH="infra/nncc/command"
 
-NNCC_PROJECT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+NNCC_PROJECT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
+NNCC_COMMAND_PATH="${NNCC_PROJECT_PATH}/${NNCC_COMMAND_RPATH}"
 NNCC_SCRIPT_PATH="${NNCC_PROJECT_PATH}/${NNCC_SCRIPT_RPATH}"
 
 function Usage()
 {
   echo "Usage: $0 [COMMAND] ..."
   echo "Command:"
-  for file in "$NNCC_COMMAND_RPATH"/*;
+  for file in "$NNCC_COMMAND_PATH"/*;
   do
     echo "  $(basename "$file")"
   done
@@ -24,7 +25,7 @@ if [[ -z "${COMMAND}" ]]; then
   exit 255
 fi
 
-COMMAND_FILE="${NNCC_PROJECT_PATH}/${NNCC_COMMAND_RPATH}/${COMMAND}"
+COMMAND_FILE="${NNCC_COMMAND_PATH}/${COMMAND}"
 
 if [[ ! -f "${COMMAND_FILE}" ]]; then
   echo "ERROR: '${COMMAND}' is not supported"
diff --git a/nnfw b/nnfw
@@ -3,14 +3,15 @@
 NNFW_SCRIPT_RPATH="runtime/infra"
 NNFW_COMMAND_RPATH="${NNFW_SCRIPT_RPATH}/command"
 
-NNFW_PROJECT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+NNFW_PROJECT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
+NNFW_COMMAND_PATH="${NNFW_PROJECT_PATH}/${NNFW_COMMAND_RPATH}"
 NNFW_SCRIPT_PATH="${NNFW_PROJECT_PATH}/${NNFW_SCRIPT_RPATH}"
 
 function Usage()
 {
   echo "Usage: $0 [COMMAND] ..."
   echo "Command:"
-  for file in "$NNFW_COMMAND_RPATH"/*;
+  for file in "$NNFW_COMMAND_PATH"/*;
   do
     echo "  $(basename "$file")"
   done
@@ -23,7 +24,7 @@ if [[ -z "${COMMAND}" ]]; then
   exit 255
 fi
 
-COMMAND_FILE="${NNFW_PROJECT_PATH}/${NNFW_COMMAND_RPATH}/${COMMAND}"
+COMMAND_FILE="${NNFW_COMMAND_PATH}/${COMMAND}"
 
 if [[ ! -f "${COMMAND_FILE}" ]]; then
   echo "ERROR: '${COMMAND}' is not supported"
