Ryan Hughes
510636b8c9
The package-installed paths live at /usr/share/omarchy; the script-install
paths live at ~/.local/share/omarchy. $OMARCHY_PATH is set by install.sh
during the install flow and by /etc/profile.d/omarchy.sh in package mode.
Scripts that hard-code the script-install path don't honour that and will
misbehave once shipped to /usr/bin.
16 files migrated via sed s|~/\.local/share/omarchy|$OMARCHY_PATH|g
and s|$HOME/\.local/share/omarchy|$OMARCHY_PATH|g:
bin/:
- omarchy-plymouth-{preview,reset,set}
- omarchy-refresh-{limine,plymouth}
- omarchy-reinstall-configs
- omarchy-show-logo
- omarchy-games-retro-install
- omarchy-install-gaming-battlenet
install/:
- config/branding.sh
- packaging/{fonts,icons}.sh
- post-install/{finished,pacman}.sh
- preflight/{migrations,pacman}.sh
Deliberately NOT migrated:
- bin/omarchy-dev-add-migration: uses 'cd ~/.local/share/omarchy' to
resolve a git repo for 'git log'. The packaged binary doesn't have a
git repo to read; this command only makes sense in dev mode where
the home path is the right one.
- bin/omarchy-install-browser:69: writes a string into a chromium
config file that chromium itself interprets; not a bash-resolved path.
- install/helpers/errors.sh:125: the boot.sh-style relaunch behaviour
needs a separate redesign.
39 lines
1.1 KiB
Bash
39 lines
1.1 KiB
Bash
stop_install_log
|
|
|
|
echo_in_style() {
|
|
echo "$1" | tte --canvas-width 0 --anchor-text c --frame-rate 640 print
|
|
}
|
|
|
|
clear
|
|
echo
|
|
tte -i $OMARCHY_PATH/logo.txt --canvas-width 0 --anchor-text c --frame-rate 920 laseretch
|
|
echo
|
|
|
|
# Display installation time if available
|
|
if [[ -f $OMARCHY_INSTALL_LOG_FILE ]] && grep -q "Total:" "$OMARCHY_INSTALL_LOG_FILE" 2>/dev/null; then
|
|
echo
|
|
TOTAL_TIME=$(tail -n 20 "$OMARCHY_INSTALL_LOG_FILE" | grep "^Total:" | sed 's/^Total:[[:space:]]*//')
|
|
if [[ -n $TOTAL_TIME ]]; then
|
|
echo_in_style "Installed in $TOTAL_TIME"
|
|
fi
|
|
else
|
|
echo_in_style "Finished installing"
|
|
fi
|
|
|
|
if sudo test -f /etc/sudoers.d/99-omarchy-installer; then
|
|
sudo rm -f /etc/sudoers.d/99-omarchy-installer &>/dev/null
|
|
fi
|
|
|
|
# Exit gracefully if user chooses not to reboot
|
|
if gum confirm --padding "0 0 0 $((PADDING_LEFT + 32))" --show-help=false --default --affirmative "Reboot Now" --negative "" ""; then
|
|
# Clear screen to hide any shutdown messages
|
|
clear
|
|
|
|
if [[ -n ${OMARCHY_CHROOT_INSTALL:-} ]]; then
|
|
touch /var/tmp/omarchy-install-completed
|
|
exit 0
|
|
else
|
|
sudo reboot 2>/dev/null
|
|
fi
|
|
fi
|