From 3d365fcc18676dc540986496717cca3018b1b283 Mon Sep 17 00:00:00 2001 From: David Flores Date: Fri, 24 Jan 2025 12:49:44 -0500 Subject: [PATCH 1/5] 14-wecome.sh added --- 14-welcome.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 14-welcome.sh diff --git a/14-welcome.sh b/14-welcome.sh new file mode 100644 index 00000000..2f1ab89c --- /dev/null +++ b/14-welcome.sh @@ -0,0 +1,7 @@ +#!/bin/bash +# read the name of the user and print hello +echo "Hello! My name is David Flores" +echo "Hello! What is your name" +read name +echo "Welcome, $name" + From 45c13fd69d4dabe5522f3feef387bd5db316d42d Mon Sep 17 00:00:00 2001 From: David Flores Date: Fri, 24 Jan 2025 13:37:39 -0500 Subject: [PATCH 2/5] completed exercise 08-count.sh --- 08-count.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/08-count.sh b/08-count.sh index c09d7cae..d36c9c29 100644 --- a/08-count.sh +++ b/08-count.sh @@ -15,3 +15,14 @@ done # exercise: Loop over some type of files and use the # "grep" UNIX command to find snippets of strings in them. +for file in *.sh; do + echo "Searching for 'function' in $file..." + + grep -n "function" "$file" + + if [ $? -eq 0 ]; then + echo "'function' found in $file" + else + echo "'function' not found in $file" + fi +done \ No newline at end of file From 174c4b7dd6e1817e02446d9517e613ab28cefc73 Mon Sep 17 00:00:00 2001 From: David Flores Date: Fri, 24 Jan 2025 13:47:57 -0500 Subject: [PATCH 3/5] second change to 08-count.sh --- 08-count.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/08-count.sh b/08-count.sh index d36c9c29..0aa657f6 100644 --- a/08-count.sh +++ b/08-count.sh @@ -16,13 +16,14 @@ done # exercise: Loop over some type of files and use the # "grep" UNIX command to find snippets of strings in them. for file in *.sh; do - echo "Searching for 'function' in $file..." - - grep -n "function" "$file" - + echo "Searching for 'echo' in $file..." + + grep -n "echo" "$file" + if [ $? -eq 0 ]; then - echo "'function' found in $file" + echo "'echo' found in $file" else - echo "'function' not found in $file" + echo "'echo' not found in $file" fi + done \ No newline at end of file From 3aa59ffb02e22d484968b0839c946eb26756a4c4 Mon Sep 17 00:00:00 2001 From: David Flores Date: Fri, 24 Jan 2025 13:56:48 -0500 Subject: [PATCH 4/5] Added screenshot of branches --- DfBranchScreenShot.png | Bin 0 -> 6373 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 DfBranchScreenShot.png diff --git a/DfBranchScreenShot.png b/DfBranchScreenShot.png new file mode 100644 index 0000000000000000000000000000000000000000..7cf02431ad25f0c6fb45c62fe3418d9f13a04b8b GIT binary patch literal 6373 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 literal 0 HcmV?d00001 From 64b85ddf3f97b2127d25db2dd5b71c5a7cf3b3cc Mon Sep 17 00:00:00 2001 From: David Flores Date: Fri, 24 Jan 2025 14:17:27 -0500 Subject: [PATCH 5/5] after merge, no conflicts for some reason --- DfBranch2_noConficts.png | Bin 0 -> 6041 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 DfBranch2_noConficts.png diff --git a/DfBranch2_noConficts.png b/DfBranch2_noConficts.png new file mode 100644 index 0000000000000000000000000000000000000000..bd618ed8b9b34f515adebeedfaeedc413b10b229 GIT binary patch literal 6041 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 mlpXpH$3%b1@&6wPF!c|y>uY;