summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2012-07-31 17:14:44 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2012-07-31 17:20:19 +0200
commitc0eadefa4ef07d1753623519bd73a3491e016a1f (patch)
tree1d681829c6c27432e8218900c254a6f2a6e9b8c4
parent0ce4af23c526a71e71931b4387fc42e48a0fb686 (diff)
build-sys: copy autogen.sh changes from systemd
- Use default sh - Fail on error
-rwxr-xr-xautogen.sh9
1 files changed, 6 insertions, 3 deletions
diff --git a/autogen.sh b/autogen.sh
index f6a5aa6c..0d1d1121 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# This file is part of systemd.
#
@@ -15,10 +15,13 @@
# You should have received a copy of the GNU General Public License
# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
+set -e
+
+if [ -f .git/hooks/pre-commit.sample ] && [ ! -f .git/hooks/pre-commit ]; then
+ # This part is allowed to fail
cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit && \
chmod +x .git/hooks/pre-commit && \
- echo "Activated pre-commit hook."
+ echo "Activated pre-commit hook." || :
fi
autoreconf --force --install --symlink