From de923cb4d528e647c2cf7768ce632ccc0c298784 Mon Sep 17 00:00:00 2001 From: Gabriel Brown Date: Fri, 21 Aug 2026 17:43:33 -0400 Subject: [PATCH] Honor PANAMA_PATH in the two stages that clobbered it 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. --- setup/scripts/change-settings | 4 +++- setup/scripts/install-packages | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/setup/scripts/change-settings b/setup/scripts/change-settings index 056aa13..3cda425 100755 --- a/setup/scripts/change-settings +++ b/setup/scripts/change-settings @@ -10,7 +10,9 @@ log() { echo -e "\033[1;34m[INFO]\033[0m $*"; } exists() { command -v "$1" >/dev/null 2>&1; } # --- 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 ---" log "Changing DNF Settings" diff --git a/setup/scripts/install-packages b/setup/scripts/install-packages index 395d92f..a3410c5 100755 --- a/setup/scripts/install-packages +++ b/setup/scripts/install-packages @@ -23,7 +23,10 @@ packages_in() { } # --- 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 # cannot disagree about what a category contains.