moved shell presence check after the shell separation header
diff --git a/source/1.0/src/shflags_test.sh b/source/1.0/src/shflags_test.sh
index c951483..3d2c335 100755
--- a/source/1.0/src/shflags_test.sh
+++ b/source/1.0/src/shflags_test.sh
@@ -94,18 +94,17 @@
for shell in ${shells}; do
echo
- # check for existance of shell
- if [ ! -x ${shell} ]; then
- th_warn "unable to run tests with the ${shell} shell"
- continue
- fi
-
cat <<EOF
#------------------------------------------------------------------------------
# Running the test suite with ${shell}
#
EOF
+ # check for existance of shell
+ if [ ! -x ${shell} ]; then
+ th_warn "unable to run tests with the ${shell} shell"
+ continue
+ fi
shell_name=`basename ${shell}`
shell_version=`versions_shellVersion "${shell}"`
diff --git a/source/1.0/src/shflags_test_private.sh b/source/1.0/src/shflags_test_private.sh
index db508a5..f145593 100755
--- a/source/1.0/src/shflags_test_private.sh
+++ b/source/1.0/src/shflags_test_private.sh
@@ -52,9 +52,9 @@
assertFalse 'empty lists should not match' $?
}
-testScreenColumns()
+testColumns()
{
- cols=`_flags_screenColumns`
+ cols=`_flags_columns`
value=`expr "${cols}" : '\([0-9]*\)'`
assertNotNull "unexpected screen width (${cols})" "${value}"
}