add variation option

README.md

@@ -15,21 +15,20 @@ Options:
 Notes:
 	The dough can be kept overnight in the refidgerator if needed
 	Water may also be used in place of beer
-	Setting an alternate recipe wont change the instructions that gets printed with -r
 	When in interactive mode, -f will get overridden
 	Try adding your choice of spices and/or herbs into the dough for more flavor
 ```
 ### Recipe (specifically for -R quick)
 ```
-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: 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
+How to make the quick calculator pizza, standmixer 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: 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,6 +1,8 @@
 #!/usr/bin/env bash
 PWD="$(dirname "$(readlink -f "$0")")" # find the pizza working directory
-RECIPE=quick
+RECIPE=${RECIPE:-quick}
+VARIATION=${VARIATION:-standmixer}
+shopt -s extglob
 
 function pizzahelp { # this only prints help text
 	echo "Pizza Calculator: The pizza script you never asked for"
@@ -16,25 +18,14 @@ function pizzahelp { # this only prints help text
 	echo "Notes:"
 	echo "	The dough can be kept overnight in the refidgerator if needed"
 	echo "	Water may also be used in place of beer"
-	echo "	Setting an alternate recipe wont change the instructions that gets printed with -r"
 	echo "	When in interactive mode, -f will get overridden"
 	echo "	Try adding your choice of spices and/or herbs into the dough for more flavor"
 	echo
 }
 
 function pizzarecipe {
-	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: 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
+	echo "How to make the $RECIPE calculator pizza, $VARIATION edition:"
+	sed -n "/\[$RECIPE:instructions:$VARIATION\]/,/^$/p" "$PWD/pizza.txt" | sed '/\[*.\]/d'
 }
 
 while getopts ":hrR:f:" option; do # loop through options, casing them
@@ -47,6 +38,8 @@ while getopts ":hrR:f:" option; do # loop through options, casing them
 			exit;;
 		f) # the end result of changing this is to alter crust thickness
 			FSI=$OPTARG;;
+		v) # change variation (usually between hand and standmixer)
+			VARIATION=$OPTARG;;
 		R) # change dough recipe
 			RECIPE=$OPTARG;;
 		\?)
@@ -84,16 +77,16 @@ function arraytio { # im funny portmantaus are never bad
 }
 
 case $1 in # this parses the first argument (and actually calls our main functions), the units need to be removed before bc will accept it
-	*g)
+	+([0-9])?(.)*([0-9])g)
 		SIZE=$(echo $1 | sed s/g//g)
 		arraytio;;
-	*\")
+	+([0-9])?(.)*([0-9])\")
 		DIAM=$(echo $1 | sed s/\"//g)
 		panarea;;
-	*inch)
+	+([0-9])?(.)*([0-9])inch)
 		DIAM=$(echo $1 | sed s/inch//g)
 		panarea;;
-	*in)
+	+([0-9])?(.)*([0-9])in)
 		DIAM=$(echo $1 | sed s/in//g)
 		panarea;;
 	*)

pizza.txt

@@ -1,33 +1,3 @@
-[15"]
-flour	375
-yeast	13
-salt	13
-oil	21
-sugar	7
-beer	235
-msg	2
-b.ex.	2
-
-[12"]
-flour	240
-yeast	8
-salt	8
-oil	13
-sugar	4
-beer	150
-msg	1
-b.ex.	1
-
-[6"]
-flour	60
-yeast	2
-salt	2
-oil	3.25
-sugar	1
-beer	37.5
-msg	0.25
-b.ex.	0.25
-
 [quick:ratios]
 flour	1
 yeast	0.03333
@@ -38,6 +8,31 @@ beer	0.625
 msg	0.00417
 b.ex.	0.00417
 
+[quick:instructions:standmixer]
+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: 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
+
+[quick:instructions:hand]
+1: warm beer to ~100f
+2: transfer to bowl and add yeast, sugar, olive oil, flour, and salt
+3: stir to combine with a spoon
+4: switch to a soaking wet hand to finish squeezing and mixing the dough until it forms a cohesive ball
+5: cover and let rise at room temp for 15min
+6: perform a strength building fold
+7: cover and let rise at room temp for another 15min
+8: turn onto, then shape to pan
+9: rise for 10 minutes
+10: add sauce, toppings
+11: bake at 550f until done
+
 [long:ratios]
 flour	1
 water	0.5