More testing and fixes for volume functions.

files/dwm/volume.function

@@ -29,19 +29,21 @@ function volume-usage {
 		    volume-usage,
 		    volume-help volume help, volume --help, volume -h
 	EOF
-	return "$1"
+	return $1
 }
 alias volume-help="volume-usage"
 alias vol-h="volume-help"
 
 function volume {
 	if [[ "$1" == "--help" || "$1" == "help" || "$1" == "-h" ]]; then
-		volume-usage
+		volume-usage 1
+		return 1
 	fi
 	if [[ (-z "$1" && -z "$2")
 	|| "$1" == "--display" || "$1" == "display" || "$1" == "-d" || "$1" == "+d"
 	]]; then
 		volume-display
+		return 0
 	fi
 
 	if [[ "$1" == *"%"* || "$2" == *"%"* ]]; then
@@ -99,6 +101,13 @@ function volume {
 		amt="$1"
 	fi
 
+	regex='^[0-9]+$'
+	if ! [[ $amt =~ $regex ]]; then
+		echo "> ERROR: Amount '$amt' does not seem like a integer."
+		volume-usage 2
+		return 2
+	fi
+
 	if [[ -n "$dir" && -n "$amt" ]]; then
 		echo "> Changing volume by '$dir$amt%'."
 		amixer -q sset Master ${amt}%${dir}
@@ -130,6 +139,8 @@ function volume-display {
 }
 alias "vol-d"="volume-display"
 
+## TBD/TODO ##
+
 # Go up and down until cancelled.
 #function volume-trip {
 #	curr eq amixer current readout