diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2009-08-24 14:43:11 +0300 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-08-24 14:43:11 +0300 |
| commit | 2f3fc2f1d6ba418303a4bab6f8fd3caed7d291b4 (patch) | |
| tree | 00bccb466ce49367f6fd54fe9f7f90557eea8738 /bootstrap.sh | |
| parent | 3025645b0b58f476f6404f2aed3b61a633794d10 (diff) | |
| parent | be46eaa5b6324d84c5ecbed5dd72dec1c87e0cb1 (diff) | |
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work
Conflicts:
src/Makefile.am
Diffstat (limited to 'bootstrap.sh')
| -rwxr-xr-x | bootstrap.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index 970e884e..c7c85823 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -47,9 +47,9 @@ case $(uname) in esac if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then - echo "Activating pre-commit hook." - cp -pv .git/hooks/pre-commit.sample .git/hooks/pre-commit - chmod -v +x .git/hooks/pre-commit + cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit && \ + chmod +x .git/hooks/pre-commit && \ + echo "Activated pre-commit hook." fi if [ -f .tarball-version ]; then |