Skip to content

Commit e54123a

Browse files
committed
fix: Fix load.bash so it actually works
1 parent e7ee77a commit e54123a

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

load.bash

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,12 @@
11
# shellcheck shell=bash
22

3-
# TODO: autogen by basalt?
4-
3+
# TODO: autogen by basalt
54
if [ -z "$BASALT_PACKAGE_PATH" ]; then
65
if [ "${BASH_SOURCE[0]::1}" = / ]; then
7-
BASALT_PACKAGE_PATH="${BASH_SOURCE[0]}"
8-
elif command -v greadlink &>/dev/null; then
9-
BASALT_PACKAGE_PATH="$(greadlink -f "${BASH_SOURCE[0]}")"
10-
elif command -v realfile &>/dev/null; then
11-
BASALT_PACKAGE_PATH="$(realfile "${BASH_SOURCE[0]}")"
12-
elif command -v readlink &>/dev/null; then
13-
BASALT_PACKAGE_PATH="$(readlink -f "${BASH_SOURCE[0]}")"
6+
BASALT_PACKAGE_PATH="${BASH_SOURCE[0]%/*}"
7+
else
8+
BASALT_PACKAGE_PATH="$(CDPATH=; cd "${BASH_SOURCE[0]%/*}" &>/dev/null; printf "$PWD")"
149
fi
15-
16-
BASALT_PACKAGE_PATH="${BASALT_PACKAGE_PATH%/*}"
17-
BASALT_PACKAGE_PATH="${BASALT_PACKAGE_PATH%/*}"
18-
BASALT_PACKAGE_PATH="${BASALT_PACKAGE_PATH%/*}"
1910
fi
2011

2112
for f in "$BASALT_PACKAGE_PATH"/pkg/lib/{,source/,util/}?*.sh; do

0 commit comments

Comments
 (0)