From 9020504180a8b67b20b93ce3b4ad65cd1192588d Mon Sep 17 00:00:00 2001 From: rotorsoft Date: Wed, 17 Dec 2025 13:20:09 -0500 Subject: [PATCH] fix scripts --- scripts/macos/cwdown.sh | 0 scripts/macos/cwup.sh | 53 ++++++++++++++++++++++++++++++++++------- 2 files changed, 45 insertions(+), 8 deletions(-) mode change 100644 => 100755 scripts/macos/cwdown.sh mode change 100644 => 100755 scripts/macos/cwup.sh diff --git a/scripts/macos/cwdown.sh b/scripts/macos/cwdown.sh old mode 100644 new mode 100755 diff --git a/scripts/macos/cwup.sh b/scripts/macos/cwup.sh old mode 100644 new mode 100755 index 3c86d47b499..e272c7a14a7 --- a/scripts/macos/cwup.sh +++ b/scripts/macos/cwup.sh @@ -7,28 +7,65 @@ set -e ensure_network() { local name=$1 - if [ "$(container network inspect "$name" 2>/dev/null)" != "[]" ]; then - echo "✓ $name" - else + + local inspect_output + if ! inspect_output=$(container network inspect "$name" 2>/dev/null); then + echo "➕ Creating network $name..." + container network create "$name" + return + fi + + if [ -z "$inspect_output" ] || [ "$inspect_output" = "[]" ]; then + echo "➕ Creating network $name..." container network create "$name" + else + echo "✓ Network $name exists" fi } ensure_volume() { local name=$1 - if [ "$(container volume inspect "$name" 2>/dev/null)" != "[]" ]; then - echo "✓ $name" - else + + local inspect_output + if ! inspect_output=$(container volume inspect "$name" 2>/dev/null); then + echo "➕ Creating volume $name..." + container volume create "$name" + return + fi + + if [ -z "$inspect_output" ] || [ "$inspect_output" = "[]" ]; then + echo "➕ Creating volume $name..." container volume create "$name" + else + echo "✓ Volume $name exists" fi } start_container() { local name=$1 shift - if ! [ "$(container inspect "$name" 2>/dev/null)" != "[]" ]; then - echo "🚀 Starting $name..." + + local inspect_output + if ! inspect_output=$(container inspect "$name" 2>/dev/null); then + echo "🚀 Creating and starting $name..." + container run -d --name "$name" "$@" + return + fi + + if [ -z "$inspect_output" ] || [ "$inspect_output" = "[]" ]; then + echo "🚀 Creating and starting $name (was empty)..." container run -d --name "$name" "$@" + return + fi + + local status + status=$(echo "$inspect_output" | jq -r '.[0].status // "unknown"') + + if [ "$status" != "running" ]; then + echo "▶️ Starting existing container $name..." + container start "$name" + else + echo "✅ $name is already running" fi }