cleaned up some

functest

@@ -2,34 +2,33 @@
 #random test of functions global and local variables
 
 function func1 () {
-echo "func1"
-local loc="This is loc from func1"
-glob="This is glob from func1"
-echo $glob
-echo $loc
+    echo "func1"
+    local loc="This is loc from func1"
+    glob="This is glob from func1"
+    echo $glob
+    echo $loc
 }
 
 function func2 () {
-echo "func2"
-echo $glob
-echo $loc
+    echo "func2"
+    echo $glob
+    echo $loc
 }
 
 function func3 () {
-echo "fun3"
-echo $glob
-echo $loc
+    echo "fun3"
+    echo $glob
+    echo $loc
 }
 
 function func4 () {
-echo "func4"
-echo $glob
-echo $loc
+    echo "func4"
+    echo $glob
+    echo $loc
 }
 
 
 #Main prog
-
 func1
 func2
 func3

select_test

@@ -1,14 +1,17 @@
 #!/bin/bash
 #tests select control flow
 
-juices=(orange papaya apple orange grape pineapple)
-trap 'echo Holy moly you pressed interrupt' SIGINT SIGTERM SIGSTOP	
+script=$(basename $0)
 
-PS3="Please choose a juice that you like  " 
-select juice in ${juices[*]} 
+
+fruit=(orange papaya apple orange grape pineapple)
+trap "echo $script interrupted; exit 1" 1 2 3 19 20	
+
+PS3="Please choose a fruit that you like  " 
+select fruit in ${fruit[*]} 
 do
-	if [ juice ]; then  
-	  echo "Here is your $juice juice"
+	if [ fruit ]; then  
+	  echo "Here is your $fruit"
 	fi 
 	break
 done