diff --git a/09-name.sh b/09-name.sh index 927672e4..c80bd37d 100644 --- a/09-name.sh +++ b/09-name.sh @@ -2,7 +2,11 @@ # look up ip addresses of various search engines -servers="github.com youtube.com twitter.com reddit.com" + +servers="google.com amazon.com hulu.com" + +servers="apple.com microsoft.com openai.com" + angelica-branch for server in $servers; do nslookup $server @@ -14,7 +18,11 @@ done # traceroute, or nslookup with other options. for server in $servers; do - ping $server +<<<<<<< HEAD + ping -c 3 $server +======= + nslookup $server +>>>>>>> angelica-branch echo "----------------------------" done diff --git a/after-merging.png b/after-merging.png new file mode 100644 index 00000000..310a5df7 Binary files /dev/null and b/after-merging.png differ diff --git a/angelica.sh b/angelica.sh new file mode 100755 index 00000000..aab2174e --- /dev/null +++ b/angelica.sh @@ -0,0 +1,21 @@ +#!/bin/bash +# read the name of the user and print hello + +echo "Hello! My name is Angelica" +read name +echo "Welcome, $name" + +# single quotes prevent the expansion of the variable +echo 'Your name was stored in $name' + +# exercise: write a script that asks the user for a +# filename and create an empty file named after it + +echo "Hey $name, What is your filename?" +read filename +echo "You want $filename" +echo "Creating $filename ..." +touch $filename +echo "$filename creted" +ls +echo "Bye,bye" diff --git a/two-branches.png b/two-branches.png new file mode 100644 index 00000000..65a8e72f Binary files /dev/null and b/two-branches.png differ