recipe and helptext corrections

README.md

@@ -3,28 +3,31 @@ Makes a very quick (45m total rise time) pan pizza, baked at 550f. Limited to ci
 
 ### Help
 ```
-Usage:	./pizza.sh [-f <N>] [<flour weight>g|<pan diameter>(in|inch|")]
-	./pizza.sh [-h]
-	./pizza.sh [-r]
+Usage:	./pizza.sh [ -f <N> ] [ -R <recipe> ] [ <flour weight>g|<pan diameter>(in|inch|") ]
+	./pizza.sh [ -h ]
+	./pizza.sh [ -r ]
 Options:
-	-h	Print this help
-	-r	Print the recipe
-	-f <N>	Set flour per square inch
+	-h		Print this help
+	-r		Print the recipe
+	-f <N>		Set flour per square inch
+	-R <recipe>	Set recipe
 Notes:
-	Typically a 10 minute pan rise is needed
 	The dough can be kept overnight in the refidgerator if needed
-	Water can also be used in place of beer
+	Water may also be used in place of beer
+	Setting an alternate recipe wont change the instructions that gets printed with -r
 ```
 ### Recipe
 ```
-How to make the calculator pizza, stand mixer edition:
+How to make the quick calculator pizza, stand mixer edition:
 	1: warm beer to ~100f, combine with sugar and yeast in mixing bowl
 	2: then add flour, salt, oil, monosodium glutamate, and butter extract
 	3: mix for 4 minutes, then shape into ball
 	4: rise for 15 minutes
 	5: mix for 5 minutes, shape into ball again
-	6: turn onto, then shape to pan
-	7: rise for 10 minutes
-	8: add sauce, toppings
-	9: bake at 550f until done
+	6: rise again for 15 minutes
+	7: turn onto, then shape to pan
+	8: rise for 10 minutes
+	9: add sauce, toppings
+	10: bake at 550f until done
+
 ```

pizza.sh

@@ -1,40 +1,41 @@
 #!/usr/bin/env bash
 FSI=2.12206590789 # default grams of Flour per Square Inch of pan, fairly neopolitan
-PWD="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" # find the pizza working directory
+PWD="$(dirname "$(readlink -f "$0")")" # find the pizza working directory
 RECIPE=quick
 
 function pizzahelp { # this only prints help text
 	echo "Pizza Calculator: The pizza script you never asked for"
 	echo
-	echo "Usage:	./pizza.sh [-f <N>] [<flour weight>g|<pan diameter>(in|inch|\")]"
-	echo "	./pizza.sh [-h]"
-	echo "	./pizza.sh [-r]"
+	echo "Usage:	$0 [ -f <N> ] [ -R <recipe> ] [ <flour weight>g|<pan diameter>(in|inch|\") ]"
+	echo "	$0 [ -h ]"
+	echo "	$0 [ -r ]"
 	echo "Options:"
-	echo "	-h	Print this help"
-	echo "	-r	Print the recipe"
-	echo "	-f <N>	Set flour per square inch"
+	echo "	-h		Print this help"
+	echo "	-r		Print the recipe"
+	echo "	-f <N>		Set flour per square inch"
+	echo "	-R <recipe>	Set recipe"
 	echo "Notes:"
-	echo "	Typically a 10 minute pan rise is needed"
 	echo "	The dough can be kept overnight in the refidgerator if needed"
-	echo "	Water can also be used in place of beer"
-	echo
+	echo "	Water may also be used in place of beer"
+	echo "	Setting an alternate recipe wont change the instructions that gets printed with -r"
 }
 
 function pizzarecipe {
-	echo "How to make the calculator pizza, stand mixer edition:"
+	echo "How to make the quick calculator pizza, stand mixer edition:"
 	echo "	1: warm beer to ~100f, combine with sugar and yeast in mixing bowl"
 	echo "	2: then add flour, salt, oil, monosodium glutamate, and butter extract"
 	echo "	3: mix for 4 minutes, then shape into ball"
 	echo "	4: rise for 15 minutes"
 	echo "	5: mix for 5 minutes, shape into ball again"
-	echo "	6: turn onto, then shape to pan"
-	echo "	7: rise for 10 minutes"
-	echo "	8: add sauce, toppings"
-	echo "	9: bake at 550f until done"
+	echo "	6: rise again for 15 minutes"
+	echo "	7: turn onto, then shape to pan"
+	echo "	8: rise for 10 minutes"
+	echo "	9: add sauce, toppings"
+	echo "	10: bake at 550f until done"
 	echo
 }
 
-while getopts ":hrf:" option; do # loop through options, casing them
+while getopts ":hrR:f:" option; do # loop through options, casing them
 	case $option in
 		h)
 			pizzahelp
@@ -43,13 +44,15 @@ while getopts ":hrf:" option; do # loop through options, casing them
 			pizzarecipe
 			exit;;
 		f) # the end result of changing this is to alter crust thickness
-			FSI=$OPTARG
-			shift 2;; # the option and its arg will be in $1 and $2 if this is specified, so they have to be shifted out
+			FSI=$OPTARG;;
+		R) # change dough recipe
+			RECIPE=$OPTARG;;
 		\?)
 			echo "Error: Invalid option"
 			exit;;
 	esac
 done
+shift $((OPTIND-1)) # shift options out from infront of the command to leave only arugment in $@
 
 function panarea {
 	AREA=$(echo "3.1415926535*($DIAM/2)^2" | bc -l) # bc cant exponentiate non-integer bases without -l