From 06198df52dc801cf77465bb4946a477a5ffa11fb Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Mon, 27 Feb 2017 09:29:02 -0800 Subject: Drop oasis from libexec tool paths This requires you to update your /.git hooks and /etc/rc.shutdown. --- src/gen.rc | 4 ++-- template/hooks/post-checkout | 2 +- template/hooks/post-merge | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gen.rc b/src/gen.rc index b58854a5..89270cd1 100644 --- a/src/gen.rc +++ b/src/gen.rc @@ -4,7 +4,7 @@ cflags\ '-std=c11' exe applyperms applyperms.c -file libexec/oasis/applyperms '$outdir'/applyperms 755 +file libexec/applyperms '$outdir'/applyperms 755 exe shutdown shutdown.c -file libexec/oasis/shutdown '$outdir'/shutdown 755 +file libexec/shutdown '$outdir'/shutdown 755 diff --git a/template/hooks/post-checkout b/template/hooks/post-checkout index 5e59bb5c..2a7a1c2a 100755 --- a/template/hooks/post-checkout +++ b/template/hooks/post-checkout @@ -12,4 +12,4 @@ else set "$old" "$new" fi -exec "$(git config oasis.root)"/libexec/oasis/applyperms "$@" +exec "$(git config oasis.root)"/libexec/applyperms "$@" diff --git a/template/hooks/post-merge b/template/hooks/post-merge index b9563d0d..f96e1313 100755 --- a/template/hooks/post-merge +++ b/template/hooks/post-merge @@ -1,3 +1,3 @@ #!/bin/sh -exec "$(git config oasis.root)"/libexec/oasis/applyperms ORIG_HEAD HEAD +exec "$(git config oasis.root)"/libexec/applyperms ORIG_HEAD HEAD -- cgit v1.2.3