Skip to content

Commit 1843ebd

Browse files
Merge pull request #952 from boffin-dmytro/fix/installer-silent-error-masks
fix(installer): replace silent || true masks with warnings in phase scripts
2 parents f62d293 + 3f16511 commit 1843ebd

File tree

2 files changed

+26
-9
lines changed

2 files changed

+26
-9
lines changed

dream-server/installers/phases/06-directories.sh

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,16 @@ Fix with: sudo chown -R \$(id -u):\$(id -g) $INSTALL_DIR/config $INSTALL_DIR/dat
9494
"$SCRIPT_DIR/" "$INSTALL_DIR/"
9595
else
9696
# Fallback: cp -r everything, then remove runtime artifacts
97-
cp -r "$SCRIPT_DIR"/* "$INSTALL_DIR/" 2>/dev/null || true
98-
cp "$SCRIPT_DIR"/.gitignore "$INSTALL_DIR/" 2>/dev/null || true
99-
rm -rf "$INSTALL_DIR/.git" 2>/dev/null || true
97+
if ! cp -r "$SCRIPT_DIR"/* "$INSTALL_DIR/" 2>>"$LOG_FILE"; then
98+
warn "Source copy incomplete — some files may be missing"
99+
fi
100+
if ! cp "$SCRIPT_DIR"/.gitignore "$INSTALL_DIR/" 2>>"$LOG_FILE"; then
101+
warn "Failed to copy .gitignore"
102+
fi
103+
rm -rf "$INSTALL_DIR/.git" 2>>"$LOG_FILE" || true
100104
fi
101105
# Ensure scripts are executable
102-
chmod +x "$INSTALL_DIR"/*.sh "$INSTALL_DIR"/scripts/*.sh "$INSTALL_DIR"/dream-cli 2>/dev/null || true
106+
chmod +x "$INSTALL_DIR"/*.sh "$INSTALL_DIR"/scripts/*.sh "$INSTALL_DIR"/dream-cli 2>>"$LOG_FILE" || warn "Some scripts may not be executable — verify after install"
103107
ai_ok "Source files installed"
104108
else
105109
log "Running in-place (source == install dir), skipping file copy"
@@ -124,7 +128,9 @@ Fix with: sudo chown -R \$(id -u):\$(id -g) $INSTALL_DIR/config $INSTALL_DIR/dat
124128
cp "$SCRIPT_DIR/config/openclaw/$OPENCLAW_CONFIG" "$INSTALL_DIR/config/openclaw/openclaw.json"
125129
else
126130
warn "OpenClaw config $OPENCLAW_CONFIG not found, using default"
127-
cp "$SCRIPT_DIR/config/openclaw/openclaw.json.example" "$INSTALL_DIR/config/openclaw/openclaw.json" 2>/dev/null || true
131+
if ! cp "$SCRIPT_DIR/config/openclaw/openclaw.json.example" "$INSTALL_DIR/config/openclaw/openclaw.json" 2>>"$LOG_FILE"; then
132+
warn "Failed to copy OpenClaw default config — you may need to create it manually"
133+
fi
128134
fi
129135
# Resolve provider name/URL before any sed replacements that depend on them
130136
OPENCLAW_PROVIDER_NAME="${OPENCLAW_PROVIDER_NAME_DEFAULT}"

dream-server/installers/phases/11-services.sh

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,10 +256,21 @@ MODELS_INI_EOF
256256
if [[ "$_BOOTSTRAP_ACTIVE" == "true" ]]; then
257257
_env_file="$INSTALL_DIR/.env"
258258
if [[ -f "$_env_file" ]]; then
259-
awk -v v="$GGUF_FILE" '{ if (index($0, "GGUF_FILE=") == 1) print "GGUF_FILE=" v; else print }' "$_env_file" > "${_env_file}.tmp" && cat "${_env_file}.tmp" > "$_env_file" && rm -f "${_env_file}.tmp"
260-
awk -v v="$LLM_MODEL" '{ if (index($0, "LLM_MODEL=") == 1) print "LLM_MODEL=" v; else print }' "$_env_file" > "${_env_file}.tmp" && cat "${_env_file}.tmp" > "$_env_file" && rm -f "${_env_file}.tmp"
261-
awk -v v="$MAX_CONTEXT" '{ if (index($0, "MAX_CONTEXT=") == 1) print "MAX_CONTEXT=" v; else print }' "$_env_file" > "${_env_file}.tmp" && cat "${_env_file}.tmp" > "$_env_file" && rm -f "${_env_file}.tmp"
262-
ai_ok "Patched .env for bootstrap model ($GGUF_FILE)"
259+
_env_patch_ok=true
260+
for _key_val in "GGUF_FILE=$GGUF_FILE" "LLM_MODEL=$LLM_MODEL" "MAX_CONTEXT=$MAX_CONTEXT"; do
261+
_key="${_key_val%%=*}"
262+
_val="${_key_val#*=}"
263+
if ! awk -v v="$_val" '{ if (index($0, "'"$_key"'=") == 1) print "'"$_key"'=" v; else print }' \
264+
"$_env_file" > "${_env_file}.tmp" 2>>"$LOG_FILE" \
265+
&& cat "${_env_file}.tmp" > "$_env_file" 2>>"$LOG_FILE" \
266+
&& rm -f "${_env_file}.tmp"; then
267+
_env_patch_ok=false
268+
warn "Failed to patch $_key in .env"
269+
fi
270+
done
271+
if [[ "$_env_patch_ok" == "true" ]]; then
272+
ai_ok "Patched .env for bootstrap model ($GGUF_FILE)"
273+
fi
263274
fi
264275
fi
265276
fi

0 commit comments

Comments
 (0)