diff options
| author | Don Williams <don.e.williams@gmail.com> | 2026-01-11 20:01:40 -0500 |
|---|---|---|
| committer | Don Williams <don.e.williams@gmail.com> | 2026-01-11 20:01:40 -0500 |
| commit | a8415be54a1cbb194a8fd915e570681f13cdce92 (patch) | |
| tree | fecda4c8a2fca61aba324fda3889003e4d8e483e /scripts | |
| parent | cf81f96f25a12e4bae9f3c3cb7b5fedd049aa7af (diff) | |
Moved ghostty/wezterm config file process out of copy.sh
On branch development
Your branch is up to date with 'origin/development'.
Changes to be committed:
modified: copy.sh
modified: scripts/lib_apps.sh
modified: scripts/lib_copy.sh
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib_apps.sh | 29 | ||||
| -rw-r--r-- | scripts/lib_copy.sh | 24 |
2 files changed, 30 insertions, 23 deletions
diff --git a/scripts/lib_apps.sh b/scripts/lib_apps.sh index a1ee2fe5..562e5c5b 100644 --- a/scripts/lib_apps.sh +++ b/scripts/lib_apps.sh @@ -57,6 +57,35 @@ ensure_keybinds_init() { fi } +install_terminal_configs() { + local log="$1" + + # Ghostty + local GHOSTTY_SRC="config/ghostty/ghostty.config" + local GHOSTTY_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/ghostty" + local GHOSTTY_DEST="$GHOSTTY_DIR/config" + if [ -f "$GHOSTTY_SRC" ]; then + mkdir -p "$GHOSTTY_DIR" + install -m 0644 "$GHOSTTY_SRC" "$GHOSTTY_DEST" 2>&1 | tee -a "$log" + if [ -f "$GHOSTTY_DIR/wallust.conf" ]; then + sed -i -E 's/^(\\s*palette\\s*=\\s*)([0-9]{1,2}):/\\1\\2=/' "$GHOSTTY_DIR/wallust.conf" 2>&1 | tee -a "$log" || true + fi + else + echo "${ERROR:-[ERROR]} - $GHOSTTY_SRC not found; skipping Ghostty config install." 2>&1 | tee -a "$log" + fi + + # WezTerm + local WEZTERM_SRC="config/wezterm/wezterm.lua" + local WEZTERM_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/wezterm" + local WEZTERM_DEST="$WEZTERM_DIR/wezterm.lua" + if [ -f "$WEZTERM_SRC" ]; then + mkdir -p "$WEZTERM_DIR" + install -m 0644 "$WEZTERM_SRC" "$WEZTERM_DEST" 2>&1 | tee -a "$log" + else + echo "${ERROR:-[ERROR]} - $WEZTERM_SRC not found; skipping WezTerm config install." 2>&1 | tee -a "$log" + fi +} + choose_default_editor() { local log="$1" local editor_set=0 diff --git a/scripts/lib_copy.sh b/scripts/lib_copy.sh index e449d668..7d76cfc4 100644 --- a/scripts/lib_copy.sh +++ b/scripts/lib_copy.sh @@ -115,27 +115,5 @@ copy_phase2() { echo "${ERROR:-[ERROR]} - Directory config/$DIR_NAME does not exist to copy." 2>&1 | tee -a "$log" fi done - # Ghostty - local GHOSTTY_SRC="config/ghostty/ghostty.config" - local GHOSTTY_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/ghostty" - local GHOSTTY_DEST="$GHOSTTY_DIR/config" - if [ -f "$GHOSTTY_SRC" ]; then - mkdir -p "$GHOSTTY_DIR" - install -m 0644 "$GHOSTTY_SRC" "$GHOSTTY_DEST" 2>&1 | tee -a "$log" - if [ -f "$GHOSTTY_DIR/wallust.conf" ]; then - sed -i -E 's/^(\\s*palette\\s*=\\s*)([0-9]{1,2}):/\\1\\2=/' "$GHOSTTY_DIR/wallust.conf" 2>&1 | tee -a "$log" || true - fi - else - echo "${ERROR:-[ERROR]} - $GHOSTTY_SRC not found; skipping Ghostty config install." 2>&1 | tee -a "$log" - fi - # WezTerm - local WEZTERM_SRC="config/wezterm/wezterm.lua" - local WEZTERM_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/wezterm" - local WEZTERM_DEST="$WEZTERM_DIR/wezterm.lua" - if [ -f "$WEZTERM_SRC" ]; then - mkdir -p "$WEZTERM_DIR" - install -m 0644 "$WEZTERM_SRC" "$WEZTERM_DEST" 2>&1 | tee -a "$log" - else - echo "${ERROR:-[ERROR]} - $WEZTERM_SRC not found; skipping WezTerm config install." 2>&1 | tee -a "$log" - fi + install_terminal_configs "$log" } |
