refactor: Make bash-object an actual library compatible with basalt

Author: hyperupcall

pkg/bin/bobject

@@ -0,0 +1,6 @@
+# shellcheck shell=bash
+
+bobject-print() {
+	# TODO
+	:
+}

pkg/lib/cmd/bobject-print.sh

@@ -1,9 +1,5 @@
 # shellcheck shell=bash
 
-for f in "$BASH_OBJECT_LIB_DIR"/{,util/}?*.sh; do
-	source "$f"
-done
-
 bobject() {
 	local subcmd="$1"
 	shift

pkg/lib/source/bobject-print.sh

@@ -0,0 +1,22 @@
+# shellcheck shell=bash
+
+# TODO: autogen by basalt?
+
+if [ -z "$BASALT_PACKAGE_PATH" ]; then
+	if [ "${BASH_SOURCE[0]::1}" = / ]; then
+		BASALT_PACKAGE_PATH="${BASH_SOURCE[0]}"
+	elif command -v greadlink &>/dev/null; then
+		BASALT_PACKAGE_PATH="$(greadlink -f "${BASH_SOURCE[0]}")"
+	elif command -v realfile &>/dev/null; then
+		BASALT_PACKAGE_PATH="$(realfile "${BASH_SOURCE[0]}")"
+	elif command -v readlink &>/dev/null; then
+		BASALT_PACKAGE_PATH="$(readlink -f "${BASH_SOURCE[0]}")"
+	fi
+
+	BASALT_PACKAGE_PATH="${BASALT_PACKAGE_PATH%/*}"
+	BASALT_PACKAGE_PATH="${BASALT_PACKAGE_PATH%/*}"
+fi
+
+for f in "$BASALT_PACKAGE_PATH"/pkg/lib/{,source/,util/}?*.sh; do
+	source "$f"
+done

pkg/lib/cmd/bobject.sh renamed to pkg/lib/source/bobject.sh

@@ -1,26 +1,15 @@
 # shellcheck shell=bash
 
+# TODO: test for -u and -o pipefail
 set -e
 
-# TODO: only do once
-eval "$(basalt global init bash)"
-
+load '../pkg/load.bash'
 load './util/test_util.sh'
 
+eval "$(basalt global init bash)"
 basalt-load 'github.com/ztombol/bats-support'
 basalt-load 'github.com/ztombol/bats-assert'
 
-# TODO
-ROOT_DIR="$(realpath "${BASH_SOURCE[0]}")"
-ROOT_DIR="${ROOT_DIR%/*}"; ROOT_DIR="${ROOT_DIR%/*}"; ROOT_DIR="${ROOT_DIR%/*}"
-
-export PATH="$ROOT_DIR/pkg/bin:$PATH"
-for f in "$ROOT_DIR"/pkg/lib/{,util}/?*.sh; do
-	# shellcheck disable=SC1090
-	source "$f"
-done
-source 'bobject'
-
 setup() {
 	cd "$BATS_TEST_TMPDIR"
 }