ZacharyZhang-NY/omarchycn
2
2
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 3 Wiki Activity

Collapse the duplicated run_logged invocation branches

Browse Source 
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
David Heinemeier Hansson
2026-07-24 12:23:23 -07:00
co-authored by Claude Opus 5
parent 3b4d8616a9
commit a2ec713603
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install/helpers/logging.sh
+9 -12
View File
@@ -51,20 +51,17 @@ run_logged() {
;; ;;
esac esac
local runner=(bash -eE)
if [[ ${OMARCHY_INSTALL_DEBUG:-} == "1" ]]; then
runner=(bash -x -eE)
fi
if omarchy_log_to_stdout; then if omarchy_log_to_stdout; then
if [[ ${OMARCHY_INSTALL_DEBUG:-} == "1" ]]; then PS4='+ ${BASH_SOURCE[0]##*/}:${LINENO}:${FUNCNAME[0]:-main}: ' \
PS4='+ ${BASH_SOURCE[0]##*/}:${LINENO}:${FUNCNAME[0]:-main}: ' \ "${runner[@]}" -c 'source "$1"' bash "$script" </dev/null 2>&1
bash -x -eE -c 'source "$1"' bash "$script" </dev/null 2>&1
else
bash -eE -c 'source "$1"' bash "$script" </dev/null 2>&1
fi
else else
if [[ ${OMARCHY_INSTALL_DEBUG:-} == "1" ]]; then PS4='+ ${BASH_SOURCE[0]##*/}:${LINENO}:${FUNCNAME[0]:-main}: ' \
PS4='+ ${BASH_SOURCE[0]##*/}:${LINENO}:${FUNCNAME[0]:-main}: ' \ "${runner[@]}" -c 'source "$1"' bash "$script" </dev/null >>"$OMARCHY_INSTALL_LOG_FILE" 2>&1
bash -x -eE -c 'source "$1"' bash "$script" </dev/null >>"$OMARCHY_INSTALL_LOG_FILE" 2>&1
else
bash -eE -c 'source "$1"' bash "$script" </dev/null >>"$OMARCHY_INSTALL_LOG_FILE" 2>&1
fi
fi fi
exit_code=$? exit_code=$?