diff options
| author |  sommerfeld <sommerfeld@sommerfeld.dev> | 2026-04-21 01:23:19 +0100 |
|---|---|---|
| committer | sommerfeld <sommerfeld@sommerfeld.dev> | 2026-04-21 01:23:19 +0100 |
| commit | 98360109941998cef8c0eda8c421c474dc3f324b (patch) | |
| tree | 2b614ca6e68340ff1a5920c2d398682697b4e270 | |
| parent | e0c98f5adbb56ab091b9c4aa94f7d79df0a6d6cb (diff) | |
| download | dotfiles-98360109941998cef8c0eda8c421c474dc3f324b.tar.gz dotfiles-98360109941998cef8c0eda8c421c474dc3f324b.tar.bz2 dotfiles-98360109941998cef8c0eda8c421c474dc3f324b.zip | |
fix: use chezmoi source-path in run scripts
chezmoi executes run scripts from a temp directory, so $(dirname $0)
resolves to /tmp instead of the repo. Use 'chezmoi source-path' to
locate etc/, etc2/, and firefox/ files.
| -rwxr-xr-x | run_onchange_after_deploy-etc.sh | 6 | ||||
| -rwxr-xr-x | run_onchange_after_deploy-firefox.sh | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/run_onchange_after_deploy-etc.sh b/run_onchange_after_deploy-etc.sh index 2e59290..aa22db1 100755 --- a/run_onchange_after_deploy-etc.sh +++ b/run_onchange_after_deploy-etc.sh @@ -3,7 +3,7 @@ # etc/ files can be symlinked; etc2/ files must be copied (tools that refuse symlinks) set -eu -SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" +SOURCE_DIR="$(chezmoi source-path)" # etc/ — symlink-friendly configs for f in \ @@ -13,7 +13,7 @@ for f in \ systemd/system.conf.d/timeout.conf do doas mkdir -p "/etc/$(dirname "$f")" - doas cp "$SCRIPT_DIR/etc/$f" "/etc/$f" + doas cp "$SOURCE_DIR/etc/$f" "/etc/$f" done # etc2/ — must be real files (e.g. reflector refuses symlinks) @@ -21,5 +21,5 @@ for f in \ xdg/reflector/reflector.conf do doas mkdir -p "/etc/$(dirname "$f")" - doas cp "$SCRIPT_DIR/etc2/$f" "/etc/$f" + doas cp "$SOURCE_DIR/etc2/$f" "/etc/$f" done diff --git a/run_onchange_after_deploy-firefox.sh b/run_onchange_after_deploy-firefox.sh index e72f304..0d1629e 100755 --- a/run_onchange_after_deploy-firefox.sh +++ b/run_onchange_after_deploy-firefox.sh @@ -2,7 +2,7 @@ # Deploy Firefox/LibreWolf hardening overrides and custom CSS set -eu -SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" +SOURCE_DIR="$(chezmoi source-path)" # Find LibreWolf profile directory (first profile with a default=1 marker) PROFILES_DIR="$HOME/.librewolf" @@ -13,8 +13,8 @@ if [ -d "$PROFILES_DIR" ]; then fi if [ -n "$PROFILE" ]; then - cp "$SCRIPT_DIR/firefox/user-overrides.js" "$PROFILE/user-overrides.js" + cp "$SOURCE_DIR/firefox/user-overrides.js" "$PROFILE/user-overrides.js" mkdir -p "$PROFILE/chrome" - cp "$SCRIPT_DIR/firefox/chrome/userChrome.css" "$PROFILE/chrome/userChrome.css" + cp "$SOURCE_DIR/firefox/chrome/userChrome.css" "$PROFILE/chrome/userChrome.css" fi fi |