refactor: Replace direct Docker commands with utility functions in snow scripts

Author: Your Name

lib-bash/snow/build.sh

@@ -4,7 +4,7 @@ function doSnowBuildImagesLogic() {
 
 	cursorSave
 	_iNote "Pruning Old Images" 
-	$SB_DOCKER_PATH image prune -f --filter "label=org.snowblower.project=$SB_PROJECT_HASH"
+	runDocker image prune -f --filter "label=org.snowblower.project=$SB_PROJECT_HASH"
 	checkLastCommand "Pruned Old Images" "Prune Failed" 1
 
 	rm -f "$SB_PROJECT_ROOT/result"
@@ -14,9 +14,9 @@ function doSnowBuildImagesLogic() {
 	runBuilder bash -c "nix build --impure --out-link "/tmp/result" .#dockerRuntimeImagePackage  && cp -rL /tmp/result /snowblower/result"
 	checkLastCommand "Building Runtime Docker Image" "Build Failed" 1
 
-	_iNote "Loading Runtime Docker Image"
 	cursorSave
-	$SB_DOCKER_PATH load -i "$SB_PROJECT_ROOT/result"
+	_iNote "Loading Runtime Docker Image"
+	runDocker load -i "$SB_PROJECT_ROOT/result"
 	checkLastCommand "Loading Runtime Docker Image" "Load Failed" 1
 
 	rm -f "$SB_PROJECT_ROOT/result"
@@ -28,7 +28,7 @@ function doSnowBuildImagesLogic() {
 
 	cursorSave
 	_iNote "Loading Tooling Docker Image" 
-	$SB_DOCKER_PATH load -i "$SB_PROJECT_ROOT/result"
+	runDocker load -i "$SB_PROJECT_ROOT/result"
 	checkLastCommand "Loading Tooling Docker Image" "Load Failed" 1
 
 	rm -f "$SB_PROJECT_ROOT/result"
@@ -39,7 +39,7 @@ function doSnowBuildImagesLogic() {
 }
 
 function doSnowBuildFilesLogic() {
-	$SB_NIX_PATH run --impure .#snowblowerFiles -L
+	runBuilder bash -c "nix run --impure .#snowblowerFiles -L"
 	return 0
 }
 

lib-bash/snow/command-execute.sh

@@ -32,7 +32,7 @@ function doRoutedCommandExecute() {
 		_iVerbose "Executing command via docker compose in %s service" $env_type
 
 		# Execute the command with proper shell evaluation
-		$SB_DOCKER_PATH compose -f "$SB_WORKSPACE_ROOT/docker-compose.yml" "${ARGS[@]}" "with-snowblower" "$@"
+		runDockerCompose "${ARGS[@]}" "with-snowblower" "$@"
 		return $?
 		;;
 	service)
@@ -45,7 +45,7 @@ function doRoutedCommandExecute() {
 		_iVerbose "Executing command via docker compose run in %s service" "$service_name"
 
 		# Execute the command using docker compose run
-		$SB_DOCKER_PATH compose -f "$SB_WORKSPACE_ROOT/docker-compose.yml" run --rm "$service_name" "$@"
+		runDockerCompose run --rm "$service_name" "$@"
 		return $?
 		;;
 	*)

lib-bash/snow/down.sh

@@ -7,7 +7,7 @@ function doSnowDownLogic() {
 
 	# If it's running, run docker compose down and wait for it to finish then run doDestroySession
 	_iOk "Stopping SnowBlower services..."
-	$SB_DOCKER_PATH compose -f "$SB_WORKSPACE_ROOT/docker-compose.yml" --profile auto-start down --remove-orphans
+	runDockerCompose --profile auto-start down --remove-orphans
 
 	_iHeart "SnowBlower has been stopped."
 	return 0

lib-bash/snow/ps.sh

@@ -6,7 +6,7 @@ function doSnowPsLogic() {
 		return 1
 	fi
 
-	$SB_DOCKER_PATH -f "$SB_WORKSPACE_ROOT/docker-compose.yml" ps
+	runDockerCompose ps
 
 	return 0
 }

lib-bash/snow/switch.sh

@@ -10,16 +10,10 @@ function doSnowSwitch() {
 		doSnowDownLogic
 	fi
 
-	doSnowBuildLogic
-
-	# Start Docker
-	doSnowUpLogic
+	doSnowBuildImagesLogic
 
 	_iNote "Running file generator..."
-	doRoutedCommandExecute tools snowblower-files
-
-	# Take it back down
-	doSnowDownLogic
+	doSnowBuildFilesLogic
 
 	_iHeart "Switch Complete"
 

lib-bash/snow/up.sh

@@ -9,7 +9,7 @@ function doSnowUpLogic() {
 	fi
 
 	# Start docker-compose detached
-	$SB_DOCKER_PATH compose -f "$SB_WORKSPACE_ROOT/docker-compose.yml" --profile auto-start up --detach --remove-orphans "$@"
+	runDockerCompose --profile auto-start up --detach --remove-orphans "$@"
 	doRoutedCommandExecute "tools" "snowblower-hooks" "tools_pre"
 
 	return 0
@@ -35,7 +35,7 @@ function doSnowUpWithMenu() {
 		echo "────────────────────────────────────────"
 
 		# Show last 20 lines of logs
-		$SB_DOCKER_PATH compose -f "$SB_WORKSPACE_ROOT/docker-compose.yml" --profile auto-start logs --tail=20 2>/dev/null || echo "No logs available yet..."
+		runDockerCompose logs --tail=20 2>/dev/null || echo "No logs available yet..."
 
 		echo "────────────────────────────────────────"
 		echo -n "Press 'q' to quit or any other key to refresh: "

lib-bash/snow/update.sh

@@ -1,6 +1,6 @@
 function doSnowUpdate {
 
-    $SB_NIX_PATH flake update
+    runNix flake update
 	doSnowSwitch
 
 	exit 0

lib-bash/snow/utils.sh

@@ -6,7 +6,10 @@ function runBuilder() {
     $SB_DOCKER_PATH compose -f "$SB_WORKSPACE_ROOT/docker-compose.yml" run --build --rm builder "$@"   
 }
 
-
 function runDockerCompose() {                                                                                  
     $SB_DOCKER_PATH compose -f "$SB_WORKSPACE_ROOT/docker-compose.yml" "$@"   
+}
+
+function runDocker() {                                                                                  
+    $SB_DOCKER_PATH "$@"   
 }