diff --git a/01-read_input_anaya_yorke.sh b/01-read_input_anaya_yorke.sh new file mode 100755 index 00000000..778c416c --- /dev/null +++ b/01-read_input_anaya_yorke.sh @@ -0,0 +1,13 @@ +#!/bin/bash +# read the name of the user and print hello + +echo "Hello from anaya yorke! What is your name" +read name +echo "Welcome, $name" +echo "How old are you?" +read age +echo 'Thanks anaya! I see you are ' $age ' years old' + +echo "What school do you currently attend?" +read school +echo 'Nice! ' $school ' sounds like a great place to learn.' diff --git a/02-add_nums.sh b/02-add_nums.sh index e8554d9d..4f5243ad 100644 --- a/02-add_nums.sh +++ b/02-add_nums.sh @@ -33,3 +33,20 @@ read height echo "" pixelTotal=$(( $width * $height )) echo "Your display has ${pixelTotal} pixels." + +# Let's calculate area of a rectangle +echo "Enter length of rectangle:" +read length +echo "Enter width of rectangle:" +read rectWidth + +area=$(( length * rectWidth )) +echo "The area of your rectangle is $area" + +# Let's also calculate area of a circle +echo "Enter radius of circle:" +read radius + +# Using simple approximation: area = 3 * radius * radius +circleArea=$(( 3 * radius * radius )) +echo "The area of your circle is approximately $circleArea" diff --git a/aftermerge_anaya.png b/aftermerge_anaya.png new file mode 100644 index 00000000..6ac6a450 Binary files /dev/null and b/aftermerge_anaya.png differ diff --git a/gitbranchparallel_anaya.png b/gitbranchparallel_anaya.png new file mode 100644 index 00000000..7c3f7d24 Binary files /dev/null and b/gitbranchparallel_anaya.png differ