X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=maint%2Ftravis-ci_prepare_env;h=561790f373d083d3c6cc8aa22506a7209b4c1683;hb=fde438edbee90ad3d9fbe66b05a1c387b13bef07;hp=e3a9e42d1939f03176b6fb04ddc226500b1bdfd1;hpb=d0b79c51514519ddd61e90123c9f7e5e792515b3;p=dbsrgits%2FDBIx-Class.git

diff --git a/maint/travis-ci_prepare_env b/maint/travis-ci_prepare_env
index e3a9e42..561790f 100755
--- a/maint/travis-ci_prepare_env
+++ b/maint/travis-ci_prepare_env
@@ -15,8 +15,9 @@ tstamp() { echo -n "[$(date '+%H:%M:%S')]" ; }
 run_or_err() {
   echo_err -n "$(tstamp) $1 ... "
 
-  LASTOUT=$( bash -c "$2" 2>&1)
-  LASTEXIT=$?
+  LASTEXIT=0
+  LASTOUT=$( bash -c "$2" 2>&1 ) || LASTEXIT=$?
+
   if [[ "$LASTEXIT" != "0" ]] ; then
     echo_err -e "FAILED !!!\nCommand executed:\n$2\nSTDOUT+STDERR:\n$LASTOUT"
     return $LASTEXIT
@@ -84,8 +85,9 @@ if [[ -n "$BREWVER" ]] ; then
   fi
 
   run_or_err "Compiling/installing Perl $BREWVER (without testing, may take up to 5 minutes)" \
-    "perlbrew install --as $BREWVER --notest $BREWOPTS -j $NUMTHREADS $BREWVER"
+    "perlbrew install --as $BREWVER --notest --verbose $BREWOPTS -j $NUMTHREADS $BREWVER"
 
+  sync
   perlbrew use $BREWVER
 fi
 
@@ -104,20 +106,20 @@ run_or_err "Configuring CPAN.pm" "perl -e '$CPAN_CFG_SCRIPT'"
 
 extract_prereqs() {
   # hack-hack-hack
+  LASTEXIT=0
   COMBINED_OUT="$( { stdout="$(cpanm --quiet --scandeps --format tree "$@")" ; } 2>&1; echo "!!!STDERRSTDOUTSEPARATOR!!!$stdout")" \
     || LASTEXIT=$?
 
   OUT=${COMBINED_OUT#*!!!STDERRSTDOUTSEPARATOR!!!}
   ERR=$(grep -v " is up to date." <<< "${COMBINED_OUT%!!!STDERRSTDOUTSEPARATOR!!!*}")
 
-  [[ -n "$LASTEXIT" ]] || LASTEXIT=0
   if [[ "$LASTEXIT" != "0" ]] || [[ -n "$ERR" ]] ; then
     echo_err "$(echo -e "Error occured (exit code $LASTEXIT) retrieving dependencies of $@:\n$ERR\n$OUT")"
     exit 1
   fi
 
   # throw away non-children (what was in $@), throw away ascii art, convert to modnames
-  perl -p -e 's/^\s*[^\\].+//; s/^[^A-Za-z]+//; s/\-[^\-]+$/ /; s/\-/::/g' <<< "$OUT"
+  perl -p -e 's/^[a-z].+//i; s/^[^a-z]+//i; s/\-[^\-]+$/ /; s/\-/::/g' <<< "$OUT"
 }
 
 parallel_installdeps_notest() {