From 00cb50b23f33ab88bc958b1cf9f68ef4da232589 Mon Sep 17 00:00:00 2001 From: Eric Collins Date: Sat, 7 Jul 2018 05:57:33 -0400 Subject: Expand DOTFILE_DIR tilde in hooks Still does not expand in every usecase, possibly does not expand in all DOTFILE_DIRS usecases. --- NEWS.md.in | 4 +++- share/rcm.sh.in | 2 ++ test/rcrc-tilde.t | 8 ++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/NEWS.md.in b/NEWS.md.in index d022a42..a288d5e 100644 --- a/NEWS.md.in +++ b/NEWS.md.in @@ -1,6 +1,8 @@ rcm (@PACKAGE_VERSION@) unstable; urgency=low - -- Mike Burns Fri, 06 Jul 2018 11:00:00 -0500 + * Feature: Expand ~ in DOTFILES_DIR hooks (Eric Collins). + + -- Mike Burns Fri, 13 Jul 2018 14:12:00 -0500 rcm (1.3.2) unstable; urgency=low diff --git a/share/rcm.sh.in b/share/rcm.sh.in index a1c9f40..a2b4492 100644 --- a/share/rcm.sh.in +++ b/share/rcm.sh.in @@ -121,6 +121,8 @@ run_hooks() { if [ $RUN_HOOKS -eq 1 ]; then for dotfiles_dir in $DOTFILES_DIRS; do + dotfiles_dir=$(eval echo "$dotfiles_dir") + hook_file="$dotfiles_dir/hooks/$when-$direction" if [ -e "$hook_file" ]; then diff --git a/test/rcrc-tilde.t b/test/rcrc-tilde.t index b3f98c1..55ab37e 100644 --- a/test/rcrc-tilde.t +++ b/test/rcrc-tilde.t @@ -8,3 +8,11 @@ rcrc should accept a DOTFILES_DIR with a ~ instead of $HOME $ echo 'DOTFILES_DIRS="~/.other-dotfiles"' > alt-rcrc $ RCRC=./alt-rcrc lsrc /*/.o-example:/*/.other-dotfiles/o-example (glob) + +rcrc should run hooks with ~ instead of $HOME + + $ mkdir ~/.other-dotfiles/hooks -p + > printf "#!/bin/sh\necho 'ran'\n" > ~/.other-dotfiles/hooks/post-up + > chmod +x ~/.other-dotfiles/hooks/post-up + > RCRC=./alt-rcrc rcup + ran -- cgit v1.2.3