From b3f25262c260e81a4bffaa6444b48013f902a04a Mon Sep 17 00:00:00 2001 From: Jarkko Kniivilä Date: Sat, 5 Sep 2015 23:31:42 +0300 Subject: Fix hooks so that they are run in the directory where they are located Calls `find(1)` with the `-exec` action just like before but instead of `run_hooks()` letting `find` execute the hook directly it is wrapped in a shell one-liner which changes to the hook's directory and executes the hook with "./" prepended to its basename. These changes allow hooks to refer to dotfiles with relative paths. For instance we can call a Makefile two directories up simply with `make -C ../..`. Also make sure we are compatible with Solaris' Bourne shell and `find(1)`. Closes #150. Closes #149. --- test/rcup-hooks-run-in-situ.t | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 test/rcup-hooks-run-in-situ.t (limited to 'test/rcup-hooks-run-in-situ.t') diff --git a/test/rcup-hooks-run-in-situ.t b/test/rcup-hooks-run-in-situ.t new file mode 100644 index 0000000..174c818 --- /dev/null +++ b/test/rcup-hooks-run-in-situ.t @@ -0,0 +1,27 @@ + $ . "$TESTDIR/helper.sh" + +Use a pre-generated UUID in a filename to make sure the filename is unique to this test +and also that the pre-up hook has found the right directory having found this file. + + $ uniquish_file_prefix='test-hooks-run-in-situ-' + > uuid='820a557b-1acb-4e86-8c5b-feb2536b5777' + > uniquish_file=${uniquish_file_prefix}${uuid} + +Pre-up and post-up hooks should run by default. More importantly the hooks\' cwd should +be the directory where they are situated. We test this by trying to find $uniquish_file. + + $ touch .dotfiles/$uniquish_file + > mkdir -p .dotfiles/hooks/pre-up .dotfiles/hooks/post-up + > touch .dotfiles/hooks/pre-up/00-test.sh .dotfiles/hooks/post-up/00-test.sh + > chmod +x .dotfiles/hooks/pre-up/00-test.sh .dotfiles/hooks/post-up/00-test.sh + + $ echo "echo ../../${uniquish_file_prefix}* > /tmp/test-$uuid" > .dotfiles/hooks/pre-up/00-test.sh + > echo "cat /tmp/test-$uuid; rm /tmp/test-$uuid" > .dotfiles/hooks/post-up/00-test.sh + + $ rcup + ../../test-hooks-run-in-situ-820a557b-1acb-4e86-8c5b-feb2536b5777 + +Ensure that hooks run when output of lsrc is non-empty + $ touch .dotfiles/testrc + > rcup + ../../test-hooks-run-in-situ-820a557b-1acb-4e86-8c5b-feb2536b5777 -- cgit v1.2.3