From 7898c22a06cbae1fb9e8ab671905d000e0eea2da Mon Sep 17 00:00:00 2001 From: Darshit Shah Date: Thu, 3 Dec 2015 09:15:23 +0100 Subject: [PATCH] Fix Shebang line and other issues with autogen.sh The shebang line was not being interpreted due to a space between # and !. On fixing it, smaller issues came to the fore due to the effects of the -e switch. Fixed them all. --- autogen.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/autogen.sh b/autogen.sh index 9de26f5..e714cf8 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,21 +1,21 @@ -# !/bin/sh -e +#!/bin/sh -e -AUTORECONF=`which autoreconf 2>/dev/null` +AUTORECONF=$(which autoreconf 2>/dev/null || true) if test $? -ne 0; then echo "No 'autoreconf' found. You must install the autoconf package." exit 1 fi -GIT=`which git 2>/dev/null` +GIT=$(which git 2>/dev/null || true) if test $? -ne 0; then echo "No 'git' found. You must install the git package." exit 1 fi # create m4 before gtkdocize -mkdir m4 2>/dev/null +mkdir m4 2>/dev/null || true -GTKDOCIZE=`which gtkdocize 2>/dev/null` +GTKDOCIZE=$(which gtkdocize 2>/dev/null || true) if test $? -ne 0; then echo "No gtk-doc support found. You can't build the docs." # rm because gtk-doc.make might be a link to a protected file @@ -29,7 +29,7 @@ fi $GIT submodule init $GIT submodule update -$AUTORECONF --install --force --symlink || exit $? +$AUTORECONF --install --force --symlink echo echo "----------------------------------------------------------------"