From: Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com>
Date: Fri, 17 Jul 2009 18:48:44 +0000 (+0200)
Subject: Further simplify on Daniel's patch for bootstrap.sh.
X-Git-Url: https://code.delx.au/pulseaudio/commitdiff_plain/8c85c9999661a57e1bd10e79ad398b812ff4ea87

Further simplify on Daniel's patch for bootstrap.sh.

Instead of having further indirections, stick to POSIX command options for
cp and chmod. This leaves just the LIBTOOL handling to be Darwin-specific.
---

diff --git a/bootstrap.sh b/bootstrap.sh
index a5bd9a78..79e0a7dc 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -42,20 +42,14 @@ set -ex
 
 case $(uname) in
 	*Darwin*)
-		CP_OPTS="-R"
-		CHMOD_OPTS=""
 		LIBTOOLIZE="glibtoolize"
 		;;
-	*)
-		CP_OPTS="-av"
-		CHMOD_OPTS="-c"
-		;;
 esac
 
 if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
     echo "Activating pre-commit hook."
-    cp ${CP_OPTS}  .git/hooks/pre-commit.sample .git/hooks/pre-commit
-    chmod ${CHMOD_OPTS} +x  .git/hooks/pre-commit
+    cp -pv  .git/hooks/pre-commit.sample .git/hooks/pre-commit
+    chmod -v +x  .git/hooks/pre-commit
 fi
 
 if [ -f .tarball-version ]; then