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

omarchy-dev-link/unlink: strip prior dev-link bin/ from PATH

Browse Source 
Sequential 'dev-link A' then 'dev-link B' previously left A/bin in
PATH because the prepend didn't strip the old one. unlink had the
same issue (it was trying to strip $(dirname $0), which only worked
if you invoked unlink via an absolute path that happened to match
the dev-link bin).

Both now read the previous OMARCHY_PATH from /etc/omarchy.conf before
overwriting/deleting it, and strip that path's bin/ from PATH before
prepending the new one (or nothing, for unlink).
This commit is contained in:
Ryan Hughes
2026-06-04 18:34:35 -04:00
parent b887d18b84
commit 6e0079a66d
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/omarchy-dev-unlink
+7 -3
View File
@@ -26,13 +26,17 @@ if [[ ! -f /etc/omarchy.conf ]]; then
exit 0
fi
# Capture the path dev-link wrote BEFORE we delete the conf, so we know
# which bin/ to strip from PATH.
prior_target=$(sed -n 's/^[[:space:]]*export[[:space:]]\+OMARCHY_PATH="\?\([^"]*\)"\?/\1/p' /etc/omarchy.conf | tail -1)
sudo rm -f /etc/omarchy.conf
echo "Removed /etc/omarchy.conf"
export OMARCHY_PATH=/usr/share/omarchy
# Drop the checkout bin/ that dev-link prepended.
PATH=$(printf '%s' "$PATH" | tr ':' '\n' | grep -vFx "$(dirname "$0")" | paste -sd:)
export PATH
if [[ -n $prior_target ]]; then
PATH=$(printf '%s' "$PATH" | tr ':' '\n' | grep -vFx "$prior_target/bin" | paste -sd:)
export PATH
fi
if command -v hyprctl >/dev/null 2>&1 && hyprctl version &>/dev/null; then
hyprctl setenv OMARCHY_PATH /usr/share/omarchy >/dev/null