Initial devel branch import from bash-3.0-alpha

examples/scripts.v2/cdhist.bash

@@ -39,7 +39,7 @@ cd()
 		set -- $HOME
 	fi
 	
-	if [ "$CDHISTFILE" -a -r "$CDHISTFILE" ] # if directory history exists
+	if [ "$CDHISTFILE" ] && [ -r "$CDHISTFILE" ] # if directory history exists
 	then
 		typeset CDHIST
 		i=-1
@@ -49,7 +49,7 @@ cd()
 		done <$CDHISTFILE
 	fi
 	
-	if [ "${CDHIST[0]}" != "$PWD" -a "$PWD" != "" ]
+	if [ "${CDHIST[0]}" != "$PWD" ] && [ -n "$PWD" ]
 	then
 		_cdins				# insert $PWD into cd history
 	fi

examples/scripts.v2/fman

@@ -56,13 +56,13 @@ FindSectionsInIndex ()
 	fi
     done
     [ -z "$indexes" ] && return
-    # Make egrep give filename
+    # Make grep give filename
     [ NIndex -lt 2 ] && indexes="$indexes /dev/null"
     # set positional parameters to
     # indexfile:searchname pagename section ...
     # e.g.
     # /usr/man/index:FP_OFF Routines DOS
-    set -- `egrep "^$page[ 	]" $indexes`
+    set -- `grep "^$page[ 	]" $indexes`
     while [ $# -gt 2 ]; do
 	FileNames[i]=${1%%index*}cat$3/$2.$3
 	Sections[i]=$3

examples/scripts.v2/frcp

@@ -110,7 +110,7 @@ function CopyFiles {
     */)	;;	# don't add / if trailing / already present
     *)  if [ $# -gt 2 ] || # if more than two args given, last must be a dir
 	    # If dest in on local machine, check whether it is a directory
-    	   [ $DestMach = $LocalMach -a -d $DestPath ] || 
+    	   [ $DestMach = $LocalMach ] && [ -d "$DestPath" ] || 
 	    # If dest ends with . or .., it is a directory
 	   lastisdot "$DestPath"
 	then

examples/scripts.v2/repeat

@@ -103,7 +103,7 @@ esac
 
 shift
 
-[ -z "$end" -o $count -le "$end" ] && increment=1 || increment=-1
+[ -z "$end" ] && [ $count -le "$end" ] && increment=1 || increment=-1
 
 istrue $verbose && echo "start=$count end=$end" 1>&2
 

examples/scripts.v2/vtree

@@ -38,7 +38,7 @@ for i in "$@"; do
         vars="$vars $i"
         ;;
     *)
-        if [ ! -x $i -o ! -d $i ]; then     # arg must be a dir and executable
+        if [ ! -x $i ] || [ ! -d $i ]; then     # arg must be a dir and executable
             echo "$i: directory not accessible."
             exit
         fi