r19107 - gnucash/trunk/packaging/win32 - Rewrite assert_one_dir function to not crash on a native build machine

Geert Janssens gjanssens at code.gnucash.org
Wed May 5 08:25:37 EDT 2010


Author: gjanssens
Date: 2010-05-05 08:25:37 -0400 (Wed, 05 May 2010)
New Revision: 19107
Trac: http://svn.gnucash.org/trac/changeset/19107

Modified:
   gnucash/trunk/packaging/win32/functions.sh
Log:
Rewrite assert_one_dir function to not crash on a native build machine


Modified: gnucash/trunk/packaging/win32/functions.sh
===================================================================
--- gnucash/trunk/packaging/win32/functions.sh	2010-05-05 10:24:27 UTC (rev 19106)
+++ gnucash/trunk/packaging/win32/functions.sh	2010-05-05 12:25:37 UTC (rev 19107)
@@ -182,8 +182,12 @@
 
 function assert_one_dir() {
     counted=$(ls -d "$@" 2>/dev/null | wc -l)
-    [[ $counted -eq 0 ]] && die "Exactly one directory is required, but detected $counted; please check why $@ wasn't created"
-    [[ $counted -gt 1 ]] && die "Exactly one directory is required, but detected $counted; please delete all but the latest one: $@"
+    if [[ $counted -eq 0 ]]; then
+        die "Exactly one directory is required, but detected $counted; please check why $@ wasn't created"
+    fi
+    if [[ $counted -gt 1 ]]; then
+        die "Exactly one directory is required, but detected $counted; please delete all but the latest one: $@"
+    fi
 }
 
 function fix_pkgconfigprefix() {



More information about the gnucash-changes mailing list