Skip to content

chore(bash32): guard declare -A callers + route dream-cli validate through $BASH #1011

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
yasinBursali wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

chore(bash32): guard declare -A callers + route dream-cli validate through $BASH #1011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dream-server/dream-cli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1114,15 +1114,15 @@ cmd_config() {
validate)
cd "$INSTALL_DIR"
if [[ -x "$INSTALL_DIR/scripts/validate-env.sh" ]]; then
"$INSTALL_DIR/scripts/validate-env.sh" "$INSTALL_DIR/.env" "$INSTALL_DIR/.env.schema.json"
"$BASH" "$INSTALL_DIR/scripts/validate-env.sh" "$INSTALL_DIR/.env" "$INSTALL_DIR/.env.schema.json"
else
warn "validate-env.sh not found at $INSTALL_DIR/scripts/validate-env.sh"
warn "Make sure you're on a recent Dream Server release."
fi
echo ""
if [[ -x "$INSTALL_DIR/scripts/validate-manifests.sh" ]]; then
log "Validating extension manifests and compatibility..."
if "$INSTALL_DIR/scripts/validate-manifests.sh"; then
if "$BASH" "$INSTALL_DIR/scripts/validate-manifests.sh"; then
success "Extension manifests validated"
else
warn "Extension manifest validation reported issues. See output above."
Expand Down
8 changes: 8 additions & 0 deletions dream-server/installers/phases/03-features.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@
# Add new optional features to the Custom menu here.
# ============================================================================

# Require Bash 4+ (associative arrays used for GPU topology/link maps)
if (( BASH_VERSINFO[0] < 4 )); then
echo "ERROR: $(basename "${BASH_SOURCE[0]}") requires Bash 4.0+ (current: $BASH_VERSION)" >&2
echo " macOS ships Bash 3.2 due to licensing. Install a modern version:" >&2
echo " brew install bash" >&2
return 1 2>/dev/null || exit 1
fi

dream_progress 18 "features" "Selecting features"
if $INTERACTIVE && ! $DRY_RUN; then
show_phase 2 6 "Feature Selection" "~1 minute"
Expand Down
8 changes: 8 additions & 0 deletions dream-server/lib/progress.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
# Dream Server — Progress Bar Utilities
# Sourced by install-core.sh for download/install progress display

# Require Bash 4+ (associative array PHASE_ESTIMATES used for phase timing)
if (( BASH_VERSINFO[0] < 4 )); then
echo "ERROR: $(basename "${BASH_SOURCE[0]}") requires Bash 4.0+ (current: $BASH_VERSION)" >&2
echo " macOS ships Bash 3.2 due to licensing. Install a modern version:" >&2
echo " brew install bash" >&2
return 1 2>/dev/null || exit 1
fi

# ═══════════════════════════════════════════════════════════════
# PROGRESS BAR
# ═══════════════════════════════════════════════════════════════
Expand Down
10 changes: 9 additions & 1 deletion dream-server/scripts/dream-test-functional.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@
# This complements dream-test.sh which checks service health.
#=============================================================================

# Require Bash 4+ (associative arrays used for service-port lookup)
if (( BASH_VERSINFO[0] < 4 )); then
echo "ERROR: $(basename "$0") requires Bash 4.0+ (you have $BASH_VERSION)" >&2
echo " macOS ships Bash 3.2 due to licensing. Install a modern version:" >&2
echo " brew install bash" >&2
exit 1
fi

set -euo pipefail

# Colors
Expand All @@ -31,7 +39,7 @@ if [[ -f "$_FT_DIR/lib/service-registry.sh" ]]; then
fi

# Ensure SERVICE_PORTS is declared even if service-registry.sh was not sourced
declare -A SERVICE_PORTS 2>/dev/null || true
declare -A SERVICE_PORTS

# Service endpoints — resolved from registry
LLM_URL="${LLM_URL:-http://localhost:${SERVICE_PORTS[llama-server]:-11434}}"
Expand Down
8 changes: 8 additions & 0 deletions dream-server/scripts/pre-download.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@
# Cache location: ~/.cache/huggingface/hub/
#=============================================================================

# Require Bash 4+ (associative arrays used for tier → model mapping)
if (( BASH_VERSINFO[0] < 4 )); then
echo "ERROR: $(basename "$0") requires Bash 4.0+ (you have $BASH_VERSION)" >&2
echo " macOS ships Bash 3.2 due to licensing. Install a modern version:" >&2
echo " brew install bash" >&2
exit 1
fi

set -euo pipefail

# Colors
Expand Down
8 changes: 8 additions & 0 deletions dream-server/scripts/validate-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@
# - Validate required keys, unknown keys, types, enums, and numeric ranges
# - Fail deterministically with a single exit code for CI

# Require Bash 4+ (associative arrays used for env key/value/line tracking)
if (( BASH_VERSINFO[0] < 4 )); then
echo "ERROR: $(basename "$0") requires Bash 4.0+ (you have $BASH_VERSION)" >&2
echo " macOS ships Bash 3.2 due to licensing. Install a modern version:" >&2
echo " brew install bash" >&2
exit 1
fi

set -euo pipefail

SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
Expand Down
Loading