b925431025
* Give SSH commands the user-level tool paths
ssh host cmd runs neither a login nor an interactive shell, so on Arch it
gets the bare sshd PATH and can't find mise-managed tools like the agent
CLIs herdr scans for. Set PATH in the PAM environment (per-user via
@{HOME}), append the user-level dirs in env-bootstrap so login shells and
the uwsm session get them too, and source env-bootstrap before bashrc's
interactive guard for bash variants that read it non-interactively.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
* Don't let an empty PATH turn into a cwd entry
Appending with a bare "$PATH:" prefix leaves a leading colon when PATH
is unset, which shells treat as the current directory.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---------
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
87 lines
3.8 KiB
Bash
Executable File
87 lines
3.8 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
set -euo pipefail
|
|
|
|
source "$(dirname "$0")/base-test.sh"
|
|
|
|
run_bootstrap() {
|
|
local shell_bin="$1"
|
|
local bootstrap="$2"
|
|
local home="$3"
|
|
local path_value="$4"
|
|
|
|
shell_bin=$(command -v "$shell_bin")
|
|
HOME="$home" PATH="$path_value" "$shell_bin" -c '
|
|
. "$1"
|
|
printf "%s\n%s\n" "$OMARCHY_PATH" "$PATH"
|
|
' sh "$bootstrap"
|
|
}
|
|
|
|
assert_path_first() {
|
|
local path_value="$1"
|
|
local entry="$2"
|
|
local description="$3"
|
|
|
|
[[ ${path_value%%:*} == "$entry" ]] || fail "$description" "expected first PATH entry: $entry\nactual PATH: $path_value"
|
|
pass "$description"
|
|
}
|
|
|
|
assert_path_present() {
|
|
local path_value="$1"
|
|
local entry="$2"
|
|
local description="$3"
|
|
|
|
case ":$path_value:" in
|
|
*":$entry:"*) pass "$description" ;;
|
|
*) fail "$description" "PATH does not contain $entry in $path_value" ;;
|
|
esac
|
|
}
|
|
|
|
tmpdir=$(mktemp -d)
|
|
trap 'rm -rf "$tmpdir"' EXIT
|
|
|
|
home="$tmpdir/home"
|
|
mkdir -p "$tmpdir/active/bin" "$tmpdir/unrelated/bin"
|
|
|
|
# Test against a copy so the test controls /etc/omarchy.conf without mutating the host.
|
|
bootstrap="$tmpdir/env-bootstrap"
|
|
sed "s#/etc/omarchy.conf#$tmpdir/omarchy.conf#g" "$ROOT/default/bash/env-bootstrap" >"$bootstrap"
|
|
|
|
printf 'export OMARCHY_PATH="/usr/share/omarchy"\n' >"$tmpdir/omarchy.conf"
|
|
mapfile -t default_result < <(run_bootstrap bash "$bootstrap" "$home" "$tmpdir/unrelated/bin:/usr/bin")
|
|
default_path=${default_result[1]}
|
|
|
|
[[ ${default_result[0]} == /usr/share/omarchy ]] || fail "env-bootstrap resolves default OMARCHY_PATH" "actual: ${default_result[0]}"
|
|
pass "env-bootstrap resolves default OMARCHY_PATH"
|
|
assert_path_present "$default_path" "$tmpdir/unrelated/bin" "env-bootstrap preserves PATH entries in default mode"
|
|
assert_path_present "$default_path" "$home/.local/share/mise/shims" "env-bootstrap appends mise shims"
|
|
assert_path_present "$default_path" "$home/.local/bin" "env-bootstrap appends ~/.local/bin"
|
|
assert_path_first "$default_path" "$tmpdir/unrelated/bin" "env-bootstrap appends user-level paths after existing entries"
|
|
|
|
printf 'export OMARCHY_PATH="%s"\n' "$tmpdir/active" >"$tmpdir/omarchy.conf"
|
|
mapfile -t linked_result < <(run_bootstrap bash "$bootstrap" "$home" "$tmpdir/unrelated/bin:/usr/bin")
|
|
linked_path=${linked_result[1]}
|
|
|
|
[[ ${linked_result[0]} == "$tmpdir/active" ]] || fail "env-bootstrap resolves linked OMARCHY_PATH" "actual: ${linked_result[0]}"
|
|
pass "env-bootstrap resolves linked OMARCHY_PATH"
|
|
assert_path_first "$linked_path" "$tmpdir/active/bin" "env-bootstrap prepends active checkout bin in linked mode"
|
|
assert_path_present "$linked_path" "$tmpdir/unrelated/bin" "env-bootstrap preserves unrelated PATH entries in linked mode"
|
|
|
|
mapfile -t linked_duplicate_result < <(run_bootstrap bash "$bootstrap" "$home" "$tmpdir/active/bin:/usr/bin:$home/.local/share/mise/shims:$home/.local/bin")
|
|
linked_duplicate_path=${linked_duplicate_result[1]}
|
|
[[ $linked_duplicate_path == "$tmpdir/active/bin:/usr/bin:$home/.local/share/mise/shims:$home/.local/bin" ]] || fail "env-bootstrap does not duplicate PATH entries" "actual PATH: $linked_duplicate_path"
|
|
pass "env-bootstrap does not duplicate PATH entries"
|
|
|
|
# An empty PATH must not produce empty entries (a bare ":" means the cwd)
|
|
mapfile -t empty_path_result < <(run_bootstrap bash "$bootstrap" "$home" "")
|
|
empty_path=${empty_path_result[1]}
|
|
[[ $empty_path == "$tmpdir/active/bin:$home/.local/share/mise/shims:$home/.local/bin" ]] || fail "env-bootstrap builds a clean PATH from an empty one" "actual PATH: $empty_path"
|
|
pass "env-bootstrap builds a clean PATH from an empty one"
|
|
|
|
if command -v zsh >/dev/null 2>&1; then
|
|
mapfile -t zsh_result < <(run_bootstrap zsh "$bootstrap" "$home" "$tmpdir/unrelated/bin:/usr/bin")
|
|
zsh_path=${zsh_result[1]}
|
|
assert_path_first "$zsh_path" "$tmpdir/active/bin" "env-bootstrap works when sourced by zsh"
|
|
assert_path_present "$zsh_path" "$tmpdir/unrelated/bin" "env-bootstrap zsh mode preserves unrelated PATH entries"
|
|
fi
|