fix: Lock directory properly deleted when using run subcommand (exec)

Author: hyperupcall

pkg/lib/commands/do-run.sh

@@ -21,9 +21,27 @@ do-run() {
 		bprint.die "The only argument must be the executable name"
 	fi
 
+	# Look in current package
 	local bin_name="${args[0]}"
+	if util.get_toml_array "$BASALT_LOCAL_PROJECT_DIR/basalt.toml" 'binDirs'; then
+		for bin_dir in "${REPLIES[@]}"; do
+			for bin_file in "$bin_dir"/*; do
+				if [ -f "$bin_file" ] && [ -x "$bin_file" ]; then
+					util.deinit
+					exec "$bin_file"
+				elif [ -f "$bin_file" ]; then
+					bprint.die "File '$bin_name' is found, but the package providing it has not made it executable"
+				else
+					bprint.die "No executable called '$bin_name' was found"
+				fi
+			done; unset bin_file
+		done; unset bin_dir
+	fi
+
+	# Look in subdependencies
 	local bin_file="$BASALT_LOCAL_PROJECT_DIR/.basalt/bin/$bin_name"
-	if [ -x "$bin_file" ]; then
+	if [ -f "$bin_file" ] && [ -x "$bin_file" ]; then
+		util.deinit
 		exec "$bin_file"
 	elif [ -f "$bin_file" ]; then
 		bprint.die "File '$bin_name' is found, but the package providing it has not made it executable"

pkg/lib/util/util.sh

@@ -69,8 +69,8 @@ util.init_always() {
 		else
 			___basalt_lock_dir="$BASALT_GLOBAL_DATA_DIR/basalt.lock"
 		fi
-		if mkdir "$___basalt_lock_dir"; then
-			trap 'rm -rf "$___basalt_lock_dir"' INT TERM EXIT
+		if mkdir "$___basalt_lock_dir" 2>/dev/null; then
+			trap 'util.deinit' INT TERM EXIT
 		else
 			bprint.die "Cannot run Basalt at this time because another Basalt process is already running (lock directory '$___basalt_lock_dir' exists)"
 		fi
@@ -81,6 +81,10 @@ util.init_always() {
 	fi
 }
 
+util.deinit() {
+	rm -rf "$___basalt_lock_dir"
+}
+
 # @description Ensure the downloaded file is really a .tar.gz file...
 util.file_is_targz() {
 	local file="$1"