From dbee6954d8a7ab8be414a4c57fc764901a9f4a18 Mon Sep 17 00:00:00 2001 From: ice0 Date: Aug 15 2018 10:28:29 +0000 Subject: Fixed wrong behavior (scipt exits with no messages) --- diff --git a/ETL/bootstrap.sh b/ETL/bootstrap.sh index 4f40d73..3ec3d9d 100755 --- a/ETL/bootstrap.sh +++ b/ETL/bootstrap.sh @@ -1,4 +1,13 @@ #! /bin/sh +set -e + +AUTORECONF=`command -v autoreconf || true` +if test -z $AUTORECONF; then + echo "*** No autoreconf found, please install it ***" + exit 1 +fi + + rm -f aclocal.m4 autoreconf --install --force diff --git a/synfig-core/bootstrap.sh b/synfig-core/bootstrap.sh index 625477d..ed05eb9 100755 --- a/synfig-core/bootstrap.sh +++ b/synfig-core/bootstrap.sh @@ -2,27 +2,27 @@ set -e -AUTORECONF=`which autoreconf` -if test -z $AUTORECONF; then +AUTORECONF=`command -v autoreconf || true` #if don't set true, script fails with no messages +if [ -z $AUTORECONF ]; then echo "*** No autoreconf found, please install it ***" exit 1 fi -INTLTOOLIZE=`which intltoolize` -if test -z $INTLTOOLIZE; then +INTLTOOLIZE=`command -v intltoolize || true` +if [ -z $INTLTOOLIZE ]; then echo "*** No intltoolize found, please install the intltool package ***" exit 1 fi -LIBTOOLIZE=`which libtoolize || true` -if test -z $LIBTOOLIZE; then - LIBTOOLIZE=`which glibtoolize` - if ! test -z $LIBTOOLIZE; then +LIBTOOLIZE=`command -v libtoolize || true` +if [ -z $LIBTOOLIZE ]; then + LIBTOOLIZE=`command -v glibtoolize || true` + if ! [ -z $LIBTOOLIZE ]; then echo "Using glibtoolize. Is it OSX?" fi fi -if test -z $LIBTOOLIZE; then +if [ -z $LIBTOOLIZE ]; then echo "*** No libtoolize nor glibtoolize found, please install the intltool package ***" exit 1 fi diff --git a/synfig-studio/bootstrap.sh b/synfig-studio/bootstrap.sh index 9f76ac1..8b77521 100755 --- a/synfig-studio/bootstrap.sh +++ b/synfig-studio/bootstrap.sh @@ -2,13 +2,13 @@ set -e -AUTORECONF=`which autoreconf` +AUTORECONF=`command -v autoreconf || true` if test -z $AUTORECONF; then echo "*** No autoreconf found, please install it ***" exit 1 fi -INTLTOOLIZE=`which intltoolize` +INTLTOOLIZE=`command -v intltoolize || true` if test -z $INTLTOOLIZE; then echo "*** No intltoolize found, please install the intltool package ***" exit 1