Skip to content

Commit 6c34274

Browse files
committed
fix: Fix package structure to be more compatible with Basalt
This moves the load.bash to the root directory. Considered adding 'sourceDirs', but that responsibility is already taken over by load.bash
1 parent 01d4fb2 commit 6c34274

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

basalt.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,8 @@ slug = 'bash_object'
44
version = '0.1.0'
55
authors = ['Edwin Kofler" <edwin@kofler.dev>']
66

7-
binDirs = [ 'pkg/bin' ]
7+
[layout]
8+
binDirs = [ './pkg/bin' ]
9+
10+
[requirements]
811
dependencies = [ 'ztombol/bats-support@v0.3.0', 'ztombol/bats-assert@v0.3.0']

pkg/load.bash renamed to load.bash

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ if [ -z "$BASALT_PACKAGE_PATH" ]; then
1515

1616
BASALT_PACKAGE_PATH="${BASALT_PACKAGE_PATH%/*}"
1717
BASALT_PACKAGE_PATH="${BASALT_PACKAGE_PATH%/*}"
18+
BASALT_PACKAGE_PATH="${BASALT_PACKAGE_PATH%/*}"
1819
fi
1920

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

tests/util/init.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# TODO: test for -u and -o pipefail
44
set -e
55

6-
load '../pkg/load.bash'
6+
load '../load.bash'
77
load './util/test_util.sh'
88

99
eval "$(basalt global init bash)"

0 commit comments

Comments
 (0)