[lastbash-cvs] lastbash lastbash,1.87,1.88

[Costin S. <cs...@us...>]

Update of /cvsroot/lastbash/lastbash
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv14158

Modified Files:
	lastbash 
Log Message:
Fixed the refresh interval erroneous setting.

Index: lastbash
===================================================================
RCS file: /cvsroot/lastbash/lastbash/lastbash,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- lastbash	6 Dec 2006 23:05:39 -0000	1.87
+++ lastbash	7 Dec 2006 22:08:23 -0000	1.88
@@ -69,6 +69,7 @@
 CR=$'\x0d'
 LF=$'\x0a'
 CTRL_L=$'\x0c'
+NUMBER_REGEXP="+([0-9])"
 
 # Set some shell options
 shopt -s nocasematch
@@ -108,7 +109,7 @@
 #-----------------------------------------------------------------------------
 function usage()
 {
-	echo "Usage: ${0##*/} [-aAdrvh] [-p player] [-r refresh] [-u username] [-c command] [station]"
+	echo "Usage: ${0##*/} [-aAdvh] [-p player] [-r refresh] [-u username] [-c command] [station]"
 }
 
 # Function: Print usage summary {{{1
@@ -178,7 +179,17 @@
 	fi
 
 	# Check and fix the refresh interval
-	[ "${REFRESH_INTERVAL}" -lt "30" ] && REFRESH_INTERVAL="30"
+	if [[ "${REFRESH_INTERVAL}" == ${NUMBER_REGEXP} ]]
+	then
+		if [ "${REFRESH_INTERVAL}" -lt "30" ]
+		then
+			debug "Refresh interval too short: ${REFRESH_INTERVAL}"
+			REFRESH_INTERVAL="30"
+		fi
+	else
+		debug "Refresh interval not numerical: ${REFRESH_INTERVAL}"
+		REFRESH_INTERVAL="30"
+	fi
 
 	# Check for player
 	if [ "${PLAYER}" == "auto" ]