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

Prepare installer for ISO-owned finalization

Browse Source
This commit is contained in:
Ryan Hughes
2026-06-04 18:38:25 -04:00
parent bcf07e424a
commit 06db866467
18 changed files with 246 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install/helpers/chroot.sh
-12
View File
@@ -1,12 +0,0 @@
# Installs are followed by reboot, so enable units without starting/reloading
# running services during the install.
chrootable_systemctl_enable() {
sudo systemctl enable $1
}
chrootable_systemctl_enable_only() {
sudo systemctl enable $1
}
export -f chrootable_systemctl_enable
export -f chrootable_systemctl_enable_only
install/helpers/logging.sh
+46 -20
View File
@@ -1,53 +1,79 @@
omarchy_log_to_stdout() {
[[ ${OMARCHY_LOG_TO_STDOUT:-} == "1" || -z ${OMARCHY_INSTALL_LOG_FILE:-} ]]
}
omarchy_log_line() {
if omarchy_log_to_stdout; then
echo "$1"
else
echo "$1" >>"$OMARCHY_INSTALL_LOG_FILE"
fi
}
start_install_log() {
mkdir -p "$(dirname "$OMARCHY_INSTALL_LOG_FILE")"
touch "$OMARCHY_INSTALL_LOG_FILE"
chmod 666 "$OMARCHY_INSTALL_LOG_FILE" 2>/dev/null || true
if ! omarchy_log_to_stdout; then
mkdir -p "$(dirname "$OMARCHY_INSTALL_LOG_FILE")"
touch "$OMARCHY_INSTALL_LOG_FILE"
chmod 666 "$OMARCHY_INSTALL_LOG_FILE" 2>/dev/null || true
fi
export OMARCHY_START_TIME="${OMARCHY_START_TIME:-$(date '+%Y-%m-%d %H:%M:%S')}"
export OMARCHY_START_EPOCH="${OMARCHY_START_EPOCH:-$(date +%s)}"
echo "=== Omarchy Setup Started: $OMARCHY_START_TIME ===" >>"$OMARCHY_INSTALL_LOG_FILE"
omarchy_log_line "=== Omarchy Setup Started: $OMARCHY_START_TIME ==="
}
stop_install_log() {
[[ -n ${OMARCHY_INSTALL_LOG_FILE:-} ]] || return 0
local end_time end_epoch duration mins secs
end_time=$(date '+%Y-%m-%d %H:%M:%S')
end_epoch=$(date +%s)
echo "=== Omarchy Setup Completed: $end_time ===" >>"$OMARCHY_INSTALL_LOG_FILE"
omarchy_log_line "=== Omarchy Setup Completed: $end_time ==="
if [[ -n ${OMARCHY_START_EPOCH:-} ]]; then
duration=$((end_epoch - OMARCHY_START_EPOCH))
mins=$((duration / 60))
secs=$((duration % 60))
echo "Omarchy setup: ${mins}m ${secs}s" >>"$OMARCHY_INSTALL_LOG_FILE"
omarchy_log_line "Omarchy setup: ${mins}m ${secs}s"
fi
}
run_logged() {
local script="$1"
local exit_code errexit_was_set=0
if [[ -z ${OMARCHY_INSTALL_LOG_FILE:-} ]]; then
bash -eE -c 'source "$1"' bash "$script"
return
fi
omarchy_log_line "[$(date '+%Y-%m-%d %H:%M:%S')] Starting: $script"
echo "[$(date '+%Y-%m-%d %H:%M:%S')] Starting: $script" >>"$OMARCHY_INSTALL_LOG_FILE"
case $- in
*e*)
errexit_was_set=1
set +e
;;
esac
if [[ ${OMARCHY_INSTALL_DEBUG:-} == "1" ]]; then
PS4='+ ${BASH_SOURCE[0]##*/}:${LINENO}:${FUNCNAME[0]:-main}: ' \
bash -x -eE -c 'source "$1"' bash "$script" </dev/null >>"$OMARCHY_INSTALL_LOG_FILE" 2>&1
if omarchy_log_to_stdout; then
if [[ ${OMARCHY_INSTALL_DEBUG:-} == "1" ]]; then
PS4='+ ${BASH_SOURCE[0]##*/}:${LINENO}:${FUNCNAME[0]:-main}: ' \
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
bash -eE -c 'source "$1"' bash "$script" </dev/null >>"$OMARCHY_INSTALL_LOG_FILE" 2>&1
if [[ ${OMARCHY_INSTALL_DEBUG:-} == "1" ]]; then
PS4='+ ${BASH_SOURCE[0]##*/}:${LINENO}:${FUNCNAME[0]:-main}: ' \
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
local exit_code=$?
exit_code=$?
(( errexit_was_set )) && set -e
if (( exit_code == 0 )); then
echo "[$(date '+%Y-%m-%d %H:%M:%S')] Completed: $script" >>"$OMARCHY_INSTALL_LOG_FILE"
omarchy_log_line "[$(date '+%Y-%m-%d %H:%M:%S')] Completed: $script"
else
echo "[$(date '+%Y-%m-%d %H:%M:%S')] Failed: $script (exit code: $exit_code)" >>"$OMARCHY_INSTALL_LOG_FILE"
omarchy_log_line "[$(date '+%Y-%m-%d %H:%M:%S')] Failed: $script (exit code: $exit_code)"
fi
return $exit_code