diff options
| l--------- | config.hs | 2 | ||||
| -rwxr-xr-x | contrib/post-checkout-hook | 28 | ||||
| -rw-r--r-- | doc/index.mdwn | 2 | ||||
| -rw-r--r-- | joeyconfig.hs (renamed from config-joey.hs) | 0 | ||||
| -rw-r--r-- | propellor.cabal | 3 |
5 files changed, 32 insertions, 3 deletions
@@ -1 +1 @@ -config-joey.hs
\ No newline at end of file +joeyconfig.hs
\ No newline at end of file diff --git a/contrib/post-checkout-hook b/contrib/post-checkout-hook new file mode 100755 index 00000000..38998398 --- /dev/null +++ b/contrib/post-checkout-hook @@ -0,0 +1,28 @@ +#!/bin/sh +# +# git post-checkout hook, used by propellor's author to maintain a +# joeyconfig branch where config.hs is a symlink to joeyconfig.hs +# +# Each time this hook is run, it checks if it's on a branch with +# name ending in "config". If so, config.hs is pointed at $branch.hs +# Otherwise, config.hs is pointed at config-simple.hs +# + +set -e +prevhead="$1" +newhead="$2" +branchcheckout="$3" +if [ "$branchcheckout" != 0 ]; then + branch="$(git symbolic-ref --short HEAD)" + case "$branch" in + "") + true + ;; + *config) + ln -sf "$branch".hs config.hs + ;; + *) + ln -sf config-simple.hs config.hs + ;; + esac +fi diff --git a/doc/index.mdwn b/doc/index.mdwn index 5961ae87..52c23021 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -4,7 +4,7 @@ [[Install]] [API documentation](http://hackage.haskell.org/package/propellor) [[Other Documentation|documentation]] -[Sample config file](http://git.joeyh.name/?p=propellor.git;a=blob;f=config-joey.hs) +[Sample config file](http://git.joeyh.name/?p=propellor.git;a=blob;f=joeyconfig.hs) [[Security]] [[Todo]] [[Forum]] diff --git a/config-joey.hs b/joeyconfig.hs index bab8f466..bab8f466 100644 --- a/config-joey.hs +++ b/joeyconfig.hs diff --git a/propellor.cabal b/propellor.cabal index 7c781c43..1366d89e 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -16,8 +16,9 @@ Extra-Source-Files: CHANGELOG Makefile config-simple.hs - config-joey.hs + joeyconfig.hs config.hs + contrib/post-checkout-hook debian/changelog debian/README.Debian debian/compat |