Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion infra/packaging/build
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion infra/packaging/res/tf2nnpkg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion infra/packaging/res/tf2nnpkg.20191215
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion infra/packaging/res/tf2nnpkg.20200220
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion infra/packaging/res/tf2nnpkg.20200508
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion infra/packaging/res/tf2nnpkg.20200616
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion infra/packaging/res/tf2nnpkg.20200630
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion infra/packaging/res/tf2nnpkg.20210406
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion infra/packaging/res/tf2nnpkg.20210706
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion infra/packaging/res/tf2nnpkg.20210910
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion infra/packaging/res/tf2nnpkg.20220323
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion infra/packaging/res/tf2nnpkg.20221125
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion infra/packaging/res/tf2nnpkg.20230413
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion infra/packaging/res/tf2nnpkg.20230907
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion infra/packaging/verify
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions infra/scripts/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion infra/scripts/configure_collect_nnpkgs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion infra/scripts/configure_compiler_coverage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions infra/scripts/tizen_xu4_test.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion infra/scripts/unittest_compiler_xml.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
2 changes: 1 addition & 1 deletion nnas
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion nncc
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion nnfw
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down