Skip to content

refactor(dream-cli): guard .env grep pipelines against pipefail kill on missing keys #1008

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

Merged
Lightheartdevs merged 1 commit into from
Apr 27, 2026
+7 −7
Merged

refactor(dream-cli): guard .env grep pipelines against pipefail kill on missing keys #1008

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
14 changes: 7 additions & 7 deletions dream-server/dream-cli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ _check_version_compat() {

# 1. Installed version
_COMPAT_INSTALLED_VER=$(grep '^DREAM_VERSION=' "$INSTALL_DIR/.env" 2>/dev/null \
| head -1 | cut -d= -f2 | tr -d '[:space:]')
| sed -n '1p' | cut -d= -f2 | tr -d '[:space:]' || true)
# Fall back to .version file (written by dream-update.sh / PR #349 convention)
if [[ -z "$_COMPAT_INSTALLED_VER" && -f "$INSTALL_DIR/.version" ]]; then
_COMPAT_INSTALLED_VER=$(jq -r '.version // empty' "$INSTALL_DIR/.version" 2>/dev/null \
Expand Down Expand Up @@ -833,7 +833,7 @@ cmd_dry_run() {
local cur_ver="0.0.0"
if [[ -f "$INSTALL_DIR/.env" ]]; then
local _v
_v=$(grep '^DREAM_VERSION=' "$INSTALL_DIR/.env" 2>/dev/null | cut -d= -f2 | tr -d '[:space:]')
_v=$(grep '^DREAM_VERSION=' "$INSTALL_DIR/.env" 2>/dev/null | cut -d= -f2 | tr -d '[:space:]' || true)
[[ -n "$_v" ]] && cur_ver="$_v"
fi
if [[ "$cur_ver" == "0.0.0" && -f "$INSTALL_DIR/.version" ]]; then
Expand All @@ -846,7 +846,7 @@ cmd_dry_run() {
local api_json=""
local dashboard_port="${DASHBOARD_PORT:-3002}"
local api_key=""
api_key=$(grep '^DASHBOARD_API_KEY=' "$INSTALL_DIR/.env" 2>/dev/null | cut -d= -f2 | tr -d '[:space:]')
api_key=$(grep '^DASHBOARD_API_KEY=' "$INSTALL_DIR/.env" 2>/dev/null | cut -d= -f2 | tr -d '[:space:]' || true)
if [[ -n "$api_key" ]]; then
api_json=$(curl -sf --max-time 5 \
-H "X-API-Key: ${api_key}" \
Expand Down Expand Up @@ -935,7 +935,7 @@ cmd_dry_run() {
local key
for key in "${model_keys[@]}"; do
local val
val=$(grep "^${key}=" "$INSTALL_DIR/.env" 2>/dev/null | cut -d= -f2 | tr -d '[:space:]')
val=$(grep "^${key}=" "$INSTALL_DIR/.env" 2>/dev/null | cut -d= -f2 | tr -d '[:space:]' || true)
printf " %-16s %s\n" "${key}:" "${val:-(not set)}"
done
echo ""
Expand All @@ -950,7 +950,7 @@ cmd_dry_run() {
else
for key in "${update_keys[@]}"; do
local val
val=$(grep "^${key}=" "$INSTALL_DIR/.env" 2>/dev/null | cut -d= -f2 | tr -d '[:space:]')
val=$(grep "^${key}=" "$INSTALL_DIR/.env" 2>/dev/null | cut -d= -f2 | tr -d '[:space:]' || true)
printf " %-16s %s\n" "${key}:" "${val:-(not set)}"
done
fi
Expand Down Expand Up @@ -1431,7 +1431,7 @@ cmd_enable() {
local current_backend="${GPU_BACKEND:-nvidia}"
if [[ -f "$INSTALL_DIR/.env" ]]; then
local env_backend
env_backend=$(grep "^GPU_BACKEND=" "$INSTALL_DIR/.env" | cut -d= -f2 | tr -d '"')
env_backend=$(grep "^GPU_BACKEND=" "$INSTALL_DIR/.env" 2>/dev/null | cut -d= -f2 | tr -d '"' || true)
if [[ -n "$env_backend" ]]; then
current_backend="$env_backend"
else
Expand Down Expand Up @@ -1778,7 +1778,7 @@ META
if [[ -f "$preset_dir/env" ]]; then
cp "$preset_dir/env" "$INSTALL_DIR/.env"
local restored_mode
restored_mode=$(grep "^DREAM_MODE=" "$INSTALL_DIR/.env" 2>/dev/null | cut -d= -f2)
restored_mode=$(grep "^DREAM_MODE=" "$INSTALL_DIR/.env" 2>/dev/null | cut -d= -f2 || true)
success "Restored .env (mode: ${restored_mode:-local})"
fi

Expand Down
Loading