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 a5bd9a7814520006a16eea2681f930f26a199b3f..79e0a7dcef8237f35e65c6fc7f02598371a0cbe8 100755 (executable)
--- 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