diff --git a/infra/packaging/build b/infra/packaging/build index e095f9df3c6..67b8d977311 100644 --- 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 index c300eb85600..7708a1bfbc8 100644 --- 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 index d334a908df6..da5679d9fb1 100644 --- 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 index 0875bad2fd2..7a6b645212e 100644 --- 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 index a9923b4a4b1..029dead3a58 100644 --- 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 index 9f0957115d0..729bdace426 100644 --- 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 index b7091541a84..55c29c17a1c 100644 --- 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 index 0d44818a116..2a9f58dcaee 100644 --- 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 index 0d44818a116..2a9f58dcaee 100644 --- 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 index 0d44818a116..2a9f58dcaee 100644 --- 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 index 5f43b238673..062a8cad1a9 100644 --- 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 index a7446e6fe4b..3bdb64d6aba 100644 --- 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 index a7446e6fe4b..3bdb64d6aba 100644 --- 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 index a7446e6fe4b..3bdb64d6aba 100644 --- 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 index 4d5e610af3b..95194022295 100644 --- 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 index 0beaf6766b4..05e42becbb8 100755 --- 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 index 9040112f42d..1fe30699feb 100755 --- 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 index e80c3e9c0e9..b3cecdc90d4 100755 --- 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 index 5610756b7c5..cb064084f8a 100755 --- 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 index 6e9e8ad7f93..bae83eee149 100755 --- 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 index 6740cf0d678..093fb0caf94 100755 --- a/nnas +++ b/nnas @@ -2,7 +2,7 @@ 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() diff --git a/nncc b/nncc index 7c9a9de2d89..fa5e6c6e30d 100755 --- a/nncc +++ b/nncc @@ -3,7 +3,7 @@ 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}" diff --git a/nnfw b/nnfw index d752a1ad495..db5b5c6a8ff 100755 --- a/nnfw +++ b/nnfw @@ -3,7 +3,7 @@ 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}"