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

Drop OMARCHY_PATH fallback and conf reading in channel detection

Browse Source
This commit is contained in:
David Heinemeier Hansson
2026-06-29 11:18:33 -05:00
parent 987addd7da
commit 4ab3377950
2 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/omarchy-channel-current
+1 -9
View File
@@ -4,18 +4,10 @@
set -euo pipefail set -euo pipefail
conf=${OMARCHY_CONFIG_FILE:-/etc/omarchy.conf}
omarchy_path=${OMARCHY_PATH:-/usr/share/omarchy}
if [[ -r $conf ]]; then
configured_path=$(bash -c 'source "$1"; printf "%s\n" "${OMARCHY_PATH:-}"' bash "$conf" 2>/dev/null || true)
[[ -n $configured_path ]] && omarchy_path="$configured_path"
fi
# Dev is a linked source checkout: OMARCHY_PATH points somewhere other than # Dev is a linked source checkout: OMARCHY_PATH points somewhere other than
# the package-backed install at /usr/share/omarchy. This takes precedence over # the package-backed install at /usr/share/omarchy. This takes precedence over
# the package channels, since the checkout overrides whatever is installed. # the package channels, since the checkout overrides whatever is installed.
if [[ $omarchy_path != "/usr/share/omarchy" ]]; then if [[ $OMARCHY_PATH != "/usr/share/omarchy" ]]; then
echo dev echo dev
exit 0 exit 0
fi fi
test/shell.d/channel-test.sh
+5 -11
View File
@@ -167,25 +167,19 @@ pass "dev refuses occupied non-checkout paths before package changes"
current_channel() { current_channel() {
OMARCHY_TEST_VERSION_CHANNEL="$1" \ OMARCHY_TEST_VERSION_CHANNEL="$1" \
OMARCHY_TEST_PACKAGES="$2" \ OMARCHY_TEST_PACKAGES="$2" \
OMARCHY_CONFIG_FILE="${3:-/dev/null}" \ OMARCHY_PATH="$3" \
OMARCHY_PATH="${4:-/usr/share/omarchy}" \
PATH="$stub_bin:$ROOT/bin:$PATH" \ PATH="$stub_bin:$ROOT/bin:$PATH" \
"$ROOT/bin/omarchy-channel-current" "$ROOT/bin/omarchy-channel-current"
} }
[[ $(current_channel stable stable) == "stable" ]] || fail "current channel detects stable" [[ $(current_channel stable stable /usr/share/omarchy) == "stable" ]] || fail "current channel detects stable"
pass "current channel detects stable" pass "current channel detects stable"
[[ $(current_channel rc stable) == "rc" ]] || fail "current channel detects rc" [[ $(current_channel rc stable /usr/share/omarchy) == "rc" ]] || fail "current channel detects rc"
pass "current channel detects rc" pass "current channel detects rc"
[[ $(current_channel edge dev /dev/null /usr/share/omarchy) == "edge" ]] || fail "current channel detects package-backed edge" [[ $(current_channel edge dev /usr/share/omarchy) == "edge" ]] || fail "current channel detects package-backed edge"
pass "current channel detects package-backed edge" pass "current channel detects package-backed edge"
[[ $(current_channel edge dev /dev/null "$test_tmp/dev-checkout") == "dev" ]] || fail "current channel detects dev from OMARCHY_PATH" [[ $(current_channel edge dev "$test_tmp/dev-checkout") == "dev" ]] || fail "current channel detects dev from OMARCHY_PATH"
pass "current channel detects dev from OMARCHY_PATH" pass "current channel detects dev from OMARCHY_PATH"
conf="$test_tmp/omarchy.conf"
printf 'export OMARCHY_PATH="%s"\n' "$test_tmp/dev-checkout" >"$conf"
[[ $(current_channel edge dev "$conf" /usr/share/omarchy) == "dev" ]] || fail "current channel detects dev from configured path"
pass "current channel detects dev from configured path"