SVN: rc-scripts/trunk/rc.d/init.d/functions

[arekm]

Author: arekm
Date: Fri Jan 15 14:56:50 2010
New Revision: 11113

Modified:
   rc-scripts/trunk/rc.d/init.d/functions
Log:
Use two separate tests instead of single double test since bash yells about wrong integer if variable is empty (and bash can source functions file).

Modified: rc-scripts/trunk/rc.d/init.d/functions
==============================================================================
--- rc-scripts/trunk/rc.d/init.d/functions	(original)
+++ rc-scripts/trunk/rc.d/init.d/functions	Fri Jan 15 14:56:50 2010
@@ -25,8 +25,8 @@
 	_setterm
 	unset _setterm
 fi
-[ -z "$LINES" -o "$LINES" -le 0 ] && LINES=40
-[ -z "$COLUMNS" -o "$COLUMNS" -le 0 ] && COLUMNS=80
+[ -z "$LINES" ] || [ "$LINES" -le 0 ] && LINES=40
+[ -z "$COLUMNS" ] || [ "$COLUMNS" -le 0 ] && COLUMNS=80
 export LINES COLUMNS
 INIT_COL=$((COLUMNS - 13))