Skip to content

Commit

Permalink
Fixed issue with utils.sh missing extension
Browse files Browse the repository at this point in the history
  • Loading branch information
mmassenzio committed Jul 21, 2024
1 parent fd55bd2 commit 5a56bd6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ success "Utilities installed to ${COMMON_UTILS}"

cat <<EOF >${HOME}/.commonrc
export COMMON_UTILS=${COMMON_UTILS}
source ${COMMON_UTILS}/utils
source ${COMMON_UTILS}/utils.sh
addpath ${COMMON_UTILS}
EOF
msg "Initialization configured to ${HOME}/.commonrc - source it from your .$(basename ${SHELL})rc"
6 changes: 3 additions & 3 deletions scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@

set -eu

if [[ -z ${UTILS_DIR} || ! -d ${UTILS_DIR} ]]; then
if [[ -z ${COMMON_UTILS} || ! -d ${COMMON_UTILS} ]]; then
echo "[ERROR] The \$UTILS_DIR env var must be defined and " \
"point to the directory which contains the Common Utilities"
exit 1
fi

source "${UTILS_DIR}"/utils
source "${COMMON_UTILS}"/utils.sh
source env.sh

BUILD=${1:-Debug}
Expand All @@ -34,7 +34,7 @@ if [[ -f conanfile.txt ]]; then
success "Dependencies installed"
fi

UTILS="-DCOMMON_UTILS_DIR=${UTILS_DIR}"
UTILS="-DCOMMON_UTILS_DIR=${COMMON_UTILS}"

cd "${BUILDDIR}"
cmake -DCMAKE_CXX_COMPILER="${CLANG}" \
Expand Down
4 changes: 2 additions & 2 deletions scripts/runtests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@

set -eu

if [[ -z ${UTILS_DIR} || ! -d ${UTILS_DIR} ]]; then
if [[ -z ${COMMON_UTILS} || ! -d ${COMMON_UTILS} ]]; then
echo "[ERROR] The \$UTILS_DIR env var must be defined and " \
"point to the directory which contains the Common Utilities"
exit 1
fi

source ${UTILS_DIR}/utils
source ${COMMON_UTILS}/utils.sh
source env.sh

verbose=""
Expand Down

0 comments on commit 5a56bd6

Please sign in to comment.