diff --git a/activate.sh b/activate.sh index 174b74806b21534b331cf2ecff4dcd7378d91bd2..dd6e78e75a8bfb316953480bc92cc9771729c8bc 100644 --- a/activate.sh +++ b/activate.sh @@ -1,9 +1,11 @@ #!/bin/bash -RELATIVE_PATH="$(dirname "${BASH_SOURCE[0]}")" +SOURCE_PATH="${BASH_SOURCE[0]}" + +RELATIVE_PATH="$(dirname "$SOURCE_PATH")" ABSOLUTE_PATH="$(realpath "${RELATIVE_PATH}")" -[[ "$0" != "${BASH_SOURCE[0]}" ]] && echo "The activation script must be sourced, otherwise the virtual environment will not work." || ( echo "Vars script must be sourced." && exit 1) ; +[[ "$0" != "${SOURCE_PATH}" ]] && echo "The activation script must be sourced, otherwise the virtual environment will not work." || ( echo "Vars script must be sourced." && exit 1) ; source "${ABSOLUTE_PATH}"/config.sh source "${ABSOLUTE_PATH}"/modules.sh diff --git a/config.sh b/config.sh index ddf20c71cade9969da31b47e68e1e3c11b82aa33..8706f744e9b3a4d2740c1d7e98cc58c7279ee896 100644 --- a/config.sh +++ b/config.sh @@ -1,7 +1,9 @@ +SOURCE_PATH="${BASH_SOURCE[0]}" + ## Check if this script is sourced -[[ "$0" != "${BASH_SOURCE[0]}" ]] && echo "Setting vars" || ( echo "Vars script must be sourced." && exit 1) ; +[[ "$0" != "${SOURCE_PATH}" ]] && echo "Setting vars" || ( echo "Vars script must be sourced." && exit 1) ; ## Determine location of this file -RELATIVE_PATH="$(dirname "${BASH_SOURCE[0]}")" +RELATIVE_PATH="$(dirname "$SOURCE_PATH")" ABSOLUTE_PATH="$(realpath "${RELATIVE_PATH}")" #################################### diff --git a/create_kernel.sh b/create_kernel.sh index edff7c35d04fe75266dedc482361964b3e44b2c7..93dd6068d54f9c7f5a5b3b88f9b2b39499e63974 100755 --- a/create_kernel.sh +++ b/create_kernel.sh @@ -1,6 +1,8 @@ #!/bin/bash -RELATIVE_PATH="$(dirname "${BASH_SOURCE[0]}")" +SOURCE_PATH="${BASH_SOURCE[0]}" + +RELATIVE_PATH="$(dirname "$SOURCE_PATH")" ABSOLUTE_PATH="$(realpath "${RELATIVE_PATH}")" source "${ABSOLUTE_PATH}"/config.sh diff --git a/setup.sh b/setup.sh index 8ef0bf6ca683aff8add9dd1e60cb3f6d96b0cb51..491a50c9ef579404ea05cfcfab25e7b134be747d 100755 --- a/setup.sh +++ b/setup.sh @@ -1,6 +1,8 @@ #!/bin/bash -RELATIVE_PATH="$(dirname "${BASH_SOURCE[0]}")" +SOURCE_PATH="${BASH_SOURCE[0]}" + +RELATIVE_PATH="$(dirname "$SOURCE_PATH")" ABSOLUTE_PATH="$(realpath "${RELATIVE_PATH}")" source "${ABSOLUTE_PATH}"/config.sh