d6.sh

@@ -44,7 +44,7 @@ function print_help() {
 }
 
 function test_case() {
-	if [ "$1" != "lower" ] && [ "$1" != "upper" ] && [ "$1" != "capital" ]
+	if [ $1 != "lower" ] && [ $1 != "upper" ] && [ $1 != "capital" ]
 	then
 		return 1
 	else
@@ -62,59 +62,52 @@ do
 	case $arg in
 		v)
 			echo "d6 v$VERSION"
-			exit 0
+			exit 0;;
-			;;
 		h)
 			print_help
-			exit 0
+			exit 0;;
-			;;
 		n)
-			NUM_WORDS=$OPTARG
+			NUM_WORDS=$OPTARG;;
-			;;
 		f)
-			WORDLIST="$OPTARG"
+			WORDLIST="$OPTARG";;
-			;;
 		d)
-			DELIMITER="$OPTARG"
+			DELIMITER="$OPTARG";;
-			;;
 		c)
-			if test_case "$OPTARG"
+			if test_case $OPTARG
 			then
 				CASE="$OPTARG"
 			else
 				echo "'$OPTARG' is an invalid case. Use 'capital', 'lower', or 'upper'."
 				exit 1
-			fi
+			fi;;
-			;;
 		?)
 			print_usage
 			exit 2
-			;;
 	esac
 done
 
 WORDS=""
 
-for i in $(seq 1 "$NUM_WORDS")
+for i in $(seq 1 $NUM_WORDS)
 do
 	ROLLS=""
-	for _j in {1..5}
+	for j in {1..5}
 	do
-		ROLLS="$((1 + RANDOM % 6))$ROLLS"
+		ROLLS="$((1 + $RANDOM % 6))$ROLLS"
 	done
 
-	if [ "$CASE" == "upper" ]
+	if [ $CASE == "upper" ]
 	then
-		WORD="$(awk "/$ROLLS/{ print toupper(\$2) }" "$WORDLIST")"
+		WORD="$(awk "/$ROLLS/{ print toupper(\$2) }" $WORDLIST)"
-	elif [ "$CASE" == "lower" ]
+	elif [ $CASE == "lower" ]
 	then
-		WORD="$(awk "/$ROLLS/{ print tolower(\$2) }" "$WORDLIST")"
+		WORD="$(awk "/$ROLLS/{ print tolower(\$2) }" $WORDLIST)"
 	else
-		WORD="$(awk "/$ROLLS/{ print \$2 }" "$WORDLIST")"
+		WORD="$(awk "/$ROLLS/{ print \$2 }" $WORDLIST)"
 		WORD="${WORD^}"
 	fi
 
-	if [ "$i" -eq "$NUM_WORDS" ]
+	if [ $i -eq $NUM_WORDS ]
 	then
 		WORDS="${WORDS}${WORD}"
 	else