diff --git a/scripts/copy_mingw64_deps.sh b/scripts/copy_mingw64_deps.sh index 522cf11c..d609911a 100755 --- a/scripts/copy_mingw64_deps.sh +++ b/scripts/copy_mingw64_deps.sh @@ -2,8 +2,8 @@ PROJECT_MINGW64_COPY_DEPENDENCIES=() -PROJECT_SCRIPTS_DIR=$(dirname "$0") -PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR}) +PROJECT_SCRIPTS_DIR=$(realpath "$0") +PROJECT_SCRIPTS_DIR=$(dirname "${PROJECT_SCRIPTS_DIR}") . "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5" 1>/dev/null 2>&1 if [ "${PROJECT_IS_MINGW}" == "1" ] && [ "${PROJECT_STATIC_LINK}" == "OFF" ]; then diff --git a/scripts/create_containers.sh b/scripts/create_containers.sh index 2f2afbd4..78155f7a 100755 --- a/scripts/create_containers.sh +++ b/scripts/create_containers.sh @@ -1,7 +1,7 @@ #!/bin/bash -PROJECT_SCRIPTS_DIR=$(dirname "$0") -PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR}) +PROJECT_SCRIPTS_DIR=$(realpath "$0") +PROJECT_SCRIPTS_DIR=$(dirname "${PROJECT_SCRIPTS_DIR}") . "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5" 1 1>/dev/null 2>&1 if [ -f "${PROJECT_SCRIPTS_DIR}/cleanup.sh" ]; then diff --git a/scripts/deliver.sh b/scripts/deliver.sh index ee83a25a..58aaa8d8 100755 --- a/scripts/deliver.sh +++ b/scripts/deliver.sh @@ -3,8 +3,8 @@ DEST_DIR=$1 DIST_DIR=$2 -PROJECT_SCRIPTS_DIR=$(dirname "$0") -PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR}) +PROJECT_SCRIPTS_DIR=$(realpath "$0") +PROJECT_SCRIPTS_DIR=$(dirname "${PROJECT_SCRIPTS_DIR}") . "${PROJECT_SCRIPTS_DIR}/env.sh" "$3" "$4" "$5" "$6" "$7" function error_exit() { diff --git a/scripts/info.sh b/scripts/info.sh index 72cd69f0..9dd8dbf7 100755 --- a/scripts/info.sh +++ b/scripts/info.sh @@ -1,5 +1,5 @@ #!/bin/bash -PROJECT_SCRIPTS_DIR=$(dirname "$0") -PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR}) +PROJECT_SCRIPTS_DIR=$(realpath "$0") +PROJECT_SCRIPTS_DIR=$(dirname "${PROJECT_SCRIPTS_DIR}") . "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5" 1 diff --git a/scripts/make_common.sh b/scripts/make_common.sh index c4a62071..34c65c47 100755 --- a/scripts/make_common.sh +++ b/scripts/make_common.sh @@ -1,7 +1,7 @@ #!/bin/bash -PROJECT_SCRIPTS_DIR=$(dirname "$0") -PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR}) +PROJECT_SCRIPTS_DIR=$(realpath "$0") +PROJECT_SCRIPTS_DIR=$(dirname "${PROJECT_SCRIPTS_DIR}") . "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5" mkdir -p "${PROJECT_BUILD_DIR}/build" @@ -60,8 +60,8 @@ for APP in ${PROJECT_APP_LIST[@]}; do rsync -av --progress "${PROJECT_BUILD_DIR}/build/${APP}${PROJECT_APP_BINARY_EXT}" "${PROJECT_DIST_DIR}/bin/" cat <>"${PROJECT_DIST_DIR}/${APP}${PROJECT_APP_BINARY_EXT}" #!/bin/sh -PROJECT_SCRIPTS_DIR=\$(dirname "\$0") -PROJECT_SCRIPTS_DIR=\$(realpath \${PROJECT_SCRIPTS_DIR}) +PROJECT_SCRIPTS_DIR=\$(realpath \${0}) +PROJECT_SCRIPTS_DIR=\$(dirname "\${PROJECT_SCRIPTS_DIR}") export LD_LIBRARY_PATH="\${PROJECT_SCRIPTS_DIR}/lib:\${PROJECT_SCRIPTS_DIR}/lib64:\${LD_LIBRARY_PATH}" diff --git a/scripts/make_package.sh b/scripts/make_package.sh index 5ea55d7a..83d1eaa2 100755 --- a/scripts/make_package.sh +++ b/scripts/make_package.sh @@ -4,8 +4,8 @@ TEMP_DIR=$(mktemp -d) DEST_DIR=$1 -PROJECT_SCRIPTS_DIR=$(dirname "$0") -PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR}) +PROJECT_SCRIPTS_DIR=$(realpath "$0") +PROJECT_SCRIPTS_DIR=$(dirname "${PROJECT_SCRIPTS_DIR}") . "${PROJECT_SCRIPTS_DIR}/env.sh" "$2" "$3" "$4" "$5" "$6" function error_exit() { diff --git a/scripts/make_unix.sh b/scripts/make_unix.sh index fcc0c214..c9efac71 100755 --- a/scripts/make_unix.sh +++ b/scripts/make_unix.sh @@ -1,7 +1,7 @@ #!/bin/bash -PROJECT_SCRIPTS_DIR=$(dirname "$0") -PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR}) +PROJECT_SCRIPTS_DIR=$(realpath "$0") +PROJECT_SCRIPTS_DIR=$(dirname "${PROJECT_SCRIPTS_DIR}") . "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" 0 0 if [ -f "${PROJECT_SCRIPTS_DIR}/cleanup.sh" ]; then diff --git a/scripts/make_win32.sh b/scripts/make_win32.sh index 18feac2c..b90b276a 100755 --- a/scripts/make_win32.sh +++ b/scripts/make_win32.sh @@ -1,7 +1,7 @@ #!/bin/bash -PROJECT_SCRIPTS_DIR=$(dirname "$0") -PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR}) +PROJECT_SCRIPTS_DIR=$(realpath "$0") +PROJECT_SCRIPTS_DIR=$(dirname "${PROJECT_SCRIPTS_DIR}") . "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" 1 1 if [ -f "${PROJECT_SCRIPTS_DIR}/cleanup.sh" ]; then diff --git a/scripts/run_docker_shell.sh b/scripts/run_docker_shell.sh index 10bb2056..c2d88aa7 100755 --- a/scripts/run_docker_shell.sh +++ b/scripts/run_docker_shell.sh @@ -2,8 +2,8 @@ DOCKER_NAME=$1 -PROJECT_SCRIPTS_DIR=$(dirname "$0") -PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR}) +PROJECT_SCRIPTS_DIR=$(realpath "$0") +PROJECT_SCRIPTS_DIR=$(dirname "${PROJECT_SCRIPTS_DIR}") . "${PROJECT_SCRIPTS_DIR}/env.sh" "$2" "$3" "$4" "$5" "$6" 1 1>/dev/null 2>&1 if [ -f "${PROJECT_SCRIPTS_DIR}/cleanup.sh" ]; then diff --git a/scripts/setup_msys2.sh b/scripts/setup_msys2.sh index 811a0367..b4181507 100755 --- a/scripts/setup_msys2.sh +++ b/scripts/setup_msys2.sh @@ -2,8 +2,8 @@ PROJECT_MSYS2_PACKAGE_LIST=() -PROJECT_SCRIPTS_DIR=$(dirname "$0") -PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR}) +PROJECT_SCRIPTS_DIR=$(realpath "$0") +PROJECT_SCRIPTS_DIR=$(dirname "${PROJECT_SCRIPTS_DIR}") . "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5" 1 1>/dev/null 2>&1 PROJECT_MSYS2_PACKAGE_LIST+=(