gib/Panama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Honor PANAMA_PATH in the two stages that clobbered it

Browse Source 
install and link-dotfiles treat it as a default; install-packages and
change-settings overwrote an exported override, so a clone anywhere but
~/.local/share/Panama sourced the extras catalog from a path that does
not exist and copied config/copy from the wrong tree.
This commit is contained in:
Gabriel Brown
2026-08-21 17:43:33 -04:00
parent bd9a55c8eb
commit de923cb4d5
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
setup/scripts/change-settings
+3 -1
View File
@@ -10,7 +10,9 @@ log() { echo -e "\033[1;34m[INFO]\033[0m $*"; }
exists() { command -v "$1" >/dev/null 2>&1; } exists() { command -v "$1" >/dev/null 2>&1; }
# --- Defined Paths --- # --- Defined Paths ---
PANAMA_PATH="$HOME/.local/share/Panama" # The default, not an assignment: an exported PANAMA_PATH from a clone at
# another location must win, or the copy over / below reads the wrong tree.
PANAMA_PATH="${PANAMA_PATH:-$HOME/.local/share/Panama}"
echo -e "\n--- Copying System & User files ---" echo -e "\n--- Copying System & User files ---"
log "Changing DNF Settings" log "Changing DNF Settings"
setup/scripts/install-packages
+4 -1
View File
@@ -23,7 +23,10 @@ packages_in() {
} }
# --- Defined Paths --- # --- Defined Paths ---
PANAMA_PATH="$HOME/.local/share/Panama" # The default, not an assignment: ./install and link-dotfiles honor an exported
# PANAMA_PATH, and clobbering it here made a clone anywhere else source the
# extras catalog from a path that does not exist.
PANAMA_PATH="${PANAMA_PATH:-$HOME/.local/share/Panama}"
# Reading the extras catalog, shared with `panama apps` so the two front doors # Reading the extras catalog, shared with `panama apps` so the two front doors
# cannot disagree about what a category contains. # cannot disagree about what a category contains.