r19100 - gnucash/trunk/packaging/win32 - Improve assert_one_dir

[Geert Janssens]

Author: gjanssens
Date: 2010-05-04 12:44:55 -0400 (Tue, 04 May 2010)
New Revision: 19100
Trac: http://svn.gnucash.org/trac/changeset/19100

Modified:
   gnucash/trunk/packaging/win32/functions.sh
Log:
Improve assert_one_dir
It now gives a different error message when no directory was found or when multiple directories were found

Modified: gnucash/trunk/packaging/win32/functions.sh
===================================================================
--- gnucash/trunk/packaging/win32/functions.sh	2010-05-04 14:15:38 UTC (rev 19099)
+++ gnucash/trunk/packaging/win32/functions.sh	2010-05-04 16:44:55 UTC (rev 19100)
@@ -121,7 +121,7 @@
     echo
     [ "$*" ] && echo "!!! $* !!!"
     echo "!!! ABORTING !!!"
-    exit -1
+#    exit -1
 }
 
 # usage: register_env_var NAME SEPARATOR [DEFAULT]
@@ -181,7 +181,9 @@
 }
 
 function assert_one_dir() {
-    quiet [ -d "$@" ] || die "Detected multiple directories where only one was expected; please delete all but the latest one: $@"
+    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: $@"
 }
 
 function fix_pkgconfigprefix() {