From 9fa7c2994e6a7bb2fe8638f54024c8e6d6f80434 Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Thu, 20 Oct 2022 09:44:30 +0530 Subject: [PATCH 01/57] fake commit-ticketID --- Script1.sh | 1 + Script2.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/Script1.sh b/Script1.sh index 970b10cc..c313d4a5 100644 --- a/Script1.sh +++ b/Script1.sh @@ -2,3 +2,4 @@ #This is my 1st shell script to print output echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" +echo "Welcome to Young Minds" diff --git a/Script2.sh b/Script2.sh index d507e753..febd7122 100644 --- a/Script2.sh +++ b/Script2.sh @@ -6,3 +6,4 @@ echo "Value of b" read b echo "Hello value of a is $a and value of b is $b" echo "This is sample change" +echo "bye" From 8376b0e2692445297592cb83d217f748931cbbfb Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Tue, 25 Oct 2022 18:24:06 +0530 Subject: [PATCH 02/57] first commit --- Script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script1.sh b/Script1.sh index c313d4a5..536502c7 100644 --- a/Script1.sh +++ b/Script1.sh @@ -3,3 +3,4 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" +echo "Best class of AWS/DevOps" \ No newline at end of file From fddbb73816ea01a7e6a7636cb8bd369947a6dbfc Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Thu, 27 Oct 2022 09:29:59 +0530 Subject: [PATCH 03/57] this change is for req- REQ660982 --- Script1.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index 536502c7..3b41a169 100644 --- a/Script1.sh +++ b/Script1.sh @@ -3,4 +3,5 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" -echo "Best class of AWS/DevOps" \ No newline at end of file +echo "Best class of AWS/DevOps" +echo "We are learning git" From bedea444bbf3cee183e525518a5753cb8d8c245d Mon Sep 17 00:00:00 2001 From: root Date: Thu, 27 Oct 2022 04:49:27 +0000 Subject: [PATCH 04/57] this is my last commit --- Script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script1.sh b/Script1.sh index 3b41a169..fca96570 100644 --- a/Script1.sh +++ b/Script1.sh @@ -5,3 +5,4 @@ echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Best class of AWS/DevOps" echo "We are learning git" +echo "We are done with git" From 5f49d89af27984fb11a167bb821a9be4a36ca72e Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Thu, 29 Dec 2022 07:47:10 +0530 Subject: [PATCH 05/57] Update Script12.sh --- Script12.sh | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/Script12.sh b/Script12.sh index d75af12d..b66caa21 100644 --- a/Script12.sh +++ b/Script12.sh @@ -1,23 +1,3 @@ -#!/bin/bash -#this script is for if-elif-fi -echo "Please enter value of a" -read a -echo "Please enter vaule of b" -read b -if [ $a == $b ] -then - echo "a is equal to b" -elif [ $a -gt $b ] -then - echo "a is greater than b" -elif [ $a -lt $b ] -then - echo "a is less than b" -else - echo "None of the condition met" -fi -root@ip-172-31-42-137:~/scripts/shellscripts# ^C -root@ip-172-31-42-137:~/scripts/shellscripts# cat script12.sh #!/bin/sh a="abc" b="efg" From 6ed411ca73e9f31cba687757e49ffb99ef54b462 Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Fri, 30 Dec 2022 08:20:25 +0530 Subject: [PATCH 06/57] I have changed 2 script- script1 & Script2 --- Script1.sh | 1 + Script2.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/Script1.sh b/Script1.sh index fca96570..975ca932 100644 --- a/Script1.sh +++ b/Script1.sh @@ -6,3 +6,4 @@ echo "Welcome to Young Minds" echo "Best class of AWS/DevOps" echo "We are learning git" echo "We are done with git" +echo "We have started our devops-git/github topic" diff --git a/Script2.sh b/Script2.sh index febd7122..07ff2a22 100644 --- a/Script2.sh +++ b/Script2.sh @@ -7,3 +7,4 @@ read b echo "Hello value of a is $a and value of b is $b" echo "This is sample change" echo "bye" +echo "hi" \ No newline at end of file From a85657f86a165138147a821295ae391bb24787e4 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Mon, 2 Jan 2023 08:03:20 +0530 Subject: [PATCH 07/57] Update Script1.sh --- Script1.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Script1.sh b/Script1.sh index 975ca932..8053a145 100644 --- a/Script1.sh +++ b/Script1.sh @@ -7,3 +7,8 @@ echo "Best class of AWS/DevOps" echo "We are learning git" echo "We are done with git" echo "We have started our devops-git/github topic" +echo "Hello, How are you?" +echo "Welcome to Young Minds" +echo "Best class of AWS/DevOps" +echo "We are learning git" +echo "We are done with git" From 8e86590d2bbdc3d8bae68e2c67453a5dc389aed9 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Mon, 2 Jan 2023 08:06:40 +0530 Subject: [PATCH 08/57] Update Script1.sh --- Script1.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Script1.sh b/Script1.sh index 975ca932..0769f2ea 100644 --- a/Script1.sh +++ b/Script1.sh @@ -7,3 +7,5 @@ echo "Best class of AWS/DevOps" echo "We are learning git" echo "We are done with git" echo "We have started our devops-git/github topic" +echo "Hello All, Welcome to AWS/Devops Class" +echo "Hello, How are you?" From a7ab09c878ee0afc434a2b0aa324cbf93e49bb7b Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Tue, 3 Jan 2023 07:50:59 +0530 Subject: [PATCH 09/57] This changes are for user request-REQ583298 --- Script1.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Script1.sh b/Script1.sh index 96f27d41..928ba9d7 100644 --- a/Script1.sh +++ b/Script1.sh @@ -6,10 +6,4 @@ echo "Welcome to Young Minds" echo "Best class of AWS/DevOps" echo "We are learning git" echo "We are done with git" -echo "We have started our devops-git/github topic" -echo "Hello, How are you?" -echo "Welcome to Young Minds" -echo "Best class of AWS/DevOps" -echo "We are learning git" -echo "We are done with git" - +echo "We have started our devops-git/github topic" \ No newline at end of file From e76d21c17fd88a03ebe11db295f7514cd202c1a8 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 5 Jan 2023 02:27:13 +0000 Subject: [PATCH 10/57] This is for fix - Incident ID --- Script1.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index 928ba9d7..bc1cd47e 100644 --- a/Script1.sh +++ b/Script1.sh @@ -6,4 +6,5 @@ echo "Welcome to Young Minds" echo "Best class of AWS/DevOps" echo "We are learning git" echo "We are done with git" -echo "We have started our devops-git/github topic" \ No newline at end of file +echo "We have started our devops-git/github topic" +echo "good morning" From af9b7ed0cb0fb70bc19d1a1f660147838fecd675 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Wed, 11 Jan 2023 09:52:52 +0530 Subject: [PATCH 11/57] Update Script12.sh --- Script12.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Script12.sh b/Script12.sh index b66caa21..5d3c8bb1 100644 --- a/Script12.sh +++ b/Script12.sh @@ -6,7 +6,7 @@ if [ $a = $b ] then echo "$a = $b : a is equal to b" else - echo "$a = $b: a is not equal to b" + echo "$a != $b: a is not equal to b" fi @@ -14,7 +14,7 @@ if [ $a != $b ] then echo "$a != $b : a is not equal to b" else - echo "$a != $b: a is equal to b" + echo "$a = $b: a is equal to b" fi From 35229074794be6606680b7dcd5c09edaf62f3485 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Wed, 11 Jan 2023 09:53:30 +0530 Subject: [PATCH 12/57] Update Script12.sh --- Script12.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Script12.sh b/Script12.sh index 5d3c8bb1..1bca0b03 100644 --- a/Script12.sh +++ b/Script12.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash a="abc" b="efg" From 199edbfd03504e3bd8e29c47b760fb24feddfc86 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Wed, 11 Jan 2023 09:57:26 +0530 Subject: [PATCH 13/57] Update Script13.sh --- Script13.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Script13.sh b/Script13.sh index 958a0150..2a534ecf 100644 --- a/Script13.sh +++ b/Script13.sh @@ -9,7 +9,7 @@ if [ $a != $b ] then echo "$a != $b : a is not equal to b" else - echo "$a != $b: a is equal to b" + echo "$a = $b: a is equal to b" fi if [ $a -lt 100 -a $b -gt 15 ] From efa99be49de7af638b391e9b85e04b19a74dcdf7 Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Thu, 2 Mar 2023 10:09:11 +0530 Subject: [PATCH 14/57] This is my first commit --- Script1.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/Script1.sh b/Script1.sh index bc1cd47e..fca96570 100644 --- a/Script1.sh +++ b/Script1.sh @@ -6,5 +6,3 @@ echo "Welcome to Young Minds" echo "Best class of AWS/DevOps" echo "We are learning git" echo "We are done with git" -echo "We have started our devops-git/github topic" -echo "good morning" From 374d03f5b910f23717f30cf4e95042ff134175aa Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Thu, 2 Mar 2023 10:12:31 +0530 Subject: [PATCH 15/57] This is my 2nd commit --- Script1.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Script1.sh b/Script1.sh index fca96570..15b8caf3 100644 --- a/Script1.sh +++ b/Script1.sh @@ -6,3 +6,5 @@ echo "Welcome to Young Minds" echo "Best class of AWS/DevOps" echo "We are learning git" echo "We are done with git" +echo "We have started our devops-git/github topic" +echo "good morning" \ No newline at end of file From 93508e07bc433b189c245616a30ddc5962b3e88f Mon Sep 17 00:00:00 2001 From: root Date: Fri, 3 Mar 2023 03:49:15 +0000 Subject: [PATCH 16/57] This is my todays first commit --- Script1.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/Script1.sh b/Script1.sh index 15b8caf3..fca96570 100644 --- a/Script1.sh +++ b/Script1.sh @@ -6,5 +6,3 @@ echo "Welcome to Young Minds" echo "Best class of AWS/DevOps" echo "We are learning git" echo "We are done with git" -echo "We have started our devops-git/github topic" -echo "good morning" \ No newline at end of file From 1fc77b18a55381fdb7cebd12acd7eacd636d3c39 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Fri, 3 Mar 2023 10:00:10 +0530 Subject: [PATCH 17/57] Update Script1.sh --- Script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script1.sh b/Script1.sh index fca96570..bdb4112f 100644 --- a/Script1.sh +++ b/Script1.sh @@ -6,3 +6,4 @@ echo "Welcome to Young Minds" echo "Best class of AWS/DevOps" echo "We are learning git" echo "We are done with git" +echo "This example is of branching strategy" From f83565f010de7072a0e6a1bf62b779cf4e86c750 Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Tue, 7 Mar 2023 20:57:09 +0530 Subject: [PATCH 18/57] We did few changes in test branch --- Script1.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Script1.sh b/Script1.sh index bdb4112f..fd58ba8f 100644 --- a/Script1.sh +++ b/Script1.sh @@ -7,3 +7,5 @@ echo "Best class of AWS/DevOps" echo "We are learning git" echo "We are done with git" echo "This example is of branching strategy" +echo "Hello Batch-16, We are learning Git/Github" +echo "Good Evening" \ No newline at end of file From 03f4d9aa7ba7a449140d7aa46aa5c94348cc8ef0 Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Tue, 7 Mar 2023 21:00:31 +0530 Subject: [PATCH 19/57] This is another commit --- Script1.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Script1.sh b/Script1.sh index bdb4112f..c7f06273 100644 --- a/Script1.sh +++ b/Script1.sh @@ -7,3 +7,5 @@ echo "Best class of AWS/DevOps" echo "We are learning git" echo "We are done with git" echo "This example is of branching strategy" +echo "We are changing script1" +echo "We have applied this changes in main branch" From 247a1cf7cdb7c5d754ade9a0953e53dc7576c384 Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Mon, 1 May 2023 07:38:32 +0530 Subject: [PATCH 20/57] This is my first commit --- Script1.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/Script1.sh b/Script1.sh index 1a87ebf9..3a91e369 100644 --- a/Script1.sh +++ b/Script1.sh @@ -8,7 +8,4 @@ echo "We are learning git" echo "We are done with git" echo "This example is of branching strategy" echo "Hello Batch-16, We are learning Git/Github" -echo "Good Evening" -echo "We are changing script1" -echo "We have applied this changes in main branch" From e7d885544df3cdb4801bd44c548674936bacf093 Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Mon, 1 May 2023 07:47:12 +0530 Subject: [PATCH 21/57] This is my 2nd commit --- Script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script1.sh b/Script1.sh index 3a91e369..235fc2b0 100644 --- a/Script1.sh +++ b/Script1.sh @@ -8,4 +8,5 @@ echo "We are learning git" echo "We are done with git" echo "This example is of branching strategy" echo "Hello Batch-16, We are learning Git/Github" +echo "Good morning batch-18" From c8a72e55411b41fb57413ea20173f4ef55486fb3 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 1 May 2023 02:27:18 +0000 Subject: [PATCH 22/57] this is my 3rd commit --- Script19.sh | 1 + 1 file changed, 1 insertion(+) create mode 100644 Script19.sh diff --git a/Script19.sh b/Script19.sh new file mode 100644 index 00000000..cc4cf194 --- /dev/null +++ b/Script19.sh @@ -0,0 +1 @@ +new script From 5f8f70290bfa202de3de6e861c51cbcb7b5e22be Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Tue, 2 May 2023 07:30:12 +0530 Subject: [PATCH 23/57] Update Script1.sh --- Script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script1.sh b/Script1.sh index 235fc2b0..4f5c6a90 100644 --- a/Script1.sh +++ b/Script1.sh @@ -9,4 +9,5 @@ echo "We are done with git" echo "This example is of branching strategy" echo "Hello Batch-16, We are learning Git/Github" echo "Good morning batch-18" +echo "I have created a new branch" From 050da8be8183bdd7ebaa484d9fdbd54183f62138 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Tue, 2 May 2023 07:40:53 +0530 Subject: [PATCH 24/57] Update Script11.sh --- Script11.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Script11.sh b/Script11.sh index d810876d..3d6c1eba 100644 --- a/Script11.sh +++ b/Script11.sh @@ -16,3 +16,5 @@ then else echo "None of the condition met" fi + +echo "I have changed this branch" From d69e7eb2a171c4df7e815b86a5cfb604fea87029 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Tue, 2 May 2023 07:50:09 +0530 Subject: [PATCH 25/57] Update Script1.sh --- Script1.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Script1.sh b/Script1.sh index 4f5c6a90..12ae52ef 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,10 +4,4 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Best class of AWS/DevOps" -echo "We are learning git" -echo "We are done with git" -echo "This example is of branching strategy" -echo "Hello Batch-16, We are learning Git/Github" -echo "Good morning batch-18" -echo "I have created a new branch" From b0c900ac267d2619ab4a00d131397ac17439fbe7 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Tue, 2 May 2023 07:51:06 +0530 Subject: [PATCH 26/57] Update Script1.sh --- Script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script1.sh b/Script1.sh index 12ae52ef..41a1bd10 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,4 +4,5 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Best class of AWS/DevOps" +echo "Hello Team" From e959ce0dbbb4f1d1b8176a827a4e6cc02c643f4f Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Tue, 2 May 2023 07:52:47 +0530 Subject: [PATCH 27/57] Update Script1.sh --- Script1.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index 41a1bd10..8b8591a9 100644 --- a/Script1.sh +++ b/Script1.sh @@ -5,4 +5,4 @@ echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Best class of AWS/DevOps" echo "Hello Team" - +echo "My name is Khan" From 5dfd283e99a42297bf8118a747f035c3a8c59b8b Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Tue, 2 May 2023 08:20:18 +0530 Subject: [PATCH 28/57] new branch commit --- Script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script1.sh b/Script1.sh index 8b8591a9..f5d06d63 100644 --- a/Script1.sh +++ b/Script1.sh @@ -6,3 +6,4 @@ echo "Welcome to Young Minds" echo "Best class of AWS/DevOps" echo "Hello Team" echo "My name is Khan" +echo "Welcome to devops" From 1d1ed7d38d8d14b005ea92d75f5a6230a5f56417 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Wed, 3 May 2023 07:23:56 +0530 Subject: [PATCH 29/57] Update Script1.sh --- Script1.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Script1.sh b/Script1.sh index f5d06d63..e9dcee6c 100644 --- a/Script1.sh +++ b/Script1.sh @@ -7,3 +7,5 @@ echo "Best class of AWS/DevOps" echo "Hello Team" echo "My name is Khan" echo "Welcome to devops" +echo "We are learning git" +echo "This batch-18" From c18078c19592a2b1bfdd5b929644899a14a75e8b Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Wed, 3 May 2023 07:24:54 +0530 Subject: [PATCH 30/57] Update Script1.sh --- Script1.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Script1.sh b/Script1.sh index f5d06d63..0129eb8e 100644 --- a/Script1.sh +++ b/Script1.sh @@ -7,3 +7,5 @@ echo "Best class of AWS/DevOps" echo "Hello Team" echo "My name is Khan" echo "Welcome to devops" +echo "Good morning" + From 41409c98edaa77e998e5ef758a1f8bf3c44d519b Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Wed, 3 May 2023 07:40:31 +0530 Subject: [PATCH 31/57] adding --- Script1.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Script1.sh b/Script1.sh index bb4f76d3..b55ba42c 100644 --- a/Script1.sh +++ b/Script1.sh @@ -11,3 +11,7 @@ echo "We are learning git" echo "This batch-18" echo "Good morning" +echo "Welcome to devops" +echo "We are learning git" +echo "This batch-18" +echo "Good morning" From a05aac5381af62c521de7b77ed9bd51871cfd388 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Sun, 7 May 2023 17:34:44 +0530 Subject: [PATCH 32/57] Update Script1.sh --- Script1.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Script1.sh b/Script1.sh index b55ba42c..bb4f76d3 100644 --- a/Script1.sh +++ b/Script1.sh @@ -11,7 +11,3 @@ echo "We are learning git" echo "This batch-18" echo "Good morning" -echo "Welcome to devops" -echo "We are learning git" -echo "This batch-18" -echo "Good morning" From aa051acc82a0dcf1e7042de1929a9e84b18e94c4 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Sun, 7 May 2023 17:49:05 +0530 Subject: [PATCH 33/57] Update Script1.sh --- Script1.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Script1.sh b/Script1.sh index bb4f76d3..c313d4a5 100644 --- a/Script1.sh +++ b/Script1.sh @@ -3,11 +3,3 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" -echo "Best class of AWS/DevOps" -echo "Hello Team" -echo "My name is Khan" -echo "Welcome to devops" -echo "We are learning git" -echo "This batch-18" -echo "Good morning" - From f4f2156b842dac6c95f3af495151fb8098b05a98 Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Wed, 12 Jul 2023 09:30:10 +0530 Subject: [PATCH 34/57] This is my commit --- Script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script1.sh b/Script1.sh index c313d4a5..c2a7db19 100644 --- a/Script1.sh +++ b/Script1.sh @@ -3,3 +3,4 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" +echo "Hello batch-19, We are learning Develops" From c45c9b0ed4bac42fdb692b085b3da95ffd2de107 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Thu, 13 Jul 2023 08:50:19 +0530 Subject: [PATCH 35/57] Update Script1.sh --- Script1.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/Script1.sh b/Script1.sh index c2a7db19..970b10cc 100644 --- a/Script1.sh +++ b/Script1.sh @@ -2,5 +2,3 @@ #This is my 1st shell script to print output echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" -echo "Welcome to Young Minds" -echo "Hello batch-19, We are learning Develops" From de2c9330f2725bd6310e402ba155b0c4d205386b Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Thu, 13 Jul 2023 09:04:25 +0530 Subject: [PATCH 36/57] Update Script1.sh --- Script1.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Script1.sh b/Script1.sh index 970b10cc..c2a7db19 100644 --- a/Script1.sh +++ b/Script1.sh @@ -2,3 +2,5 @@ #This is my 1st shell script to print output echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" +echo "Welcome to Young Minds" +echo "Hello batch-19, We are learning Develops" From a666719db2e20f3d3393e7a8d09a0ddef92a4225 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Thu, 13 Jul 2023 09:52:02 +0530 Subject: [PATCH 37/57] Update Script1.sh --- Script1.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Script1.sh b/Script1.sh index c2a7db19..ff637c7c 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,3 +4,6 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-19, We are learning Develops" +echo "Hello All, Welcome to AWS/Devops Class" +echo "Hello, How are you?" +echo "Welcome to Young Minds" From fe1a81c496cd07f40c13756fbd4c53ff9b6c59ec Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Thu, 13 Jul 2023 09:52:51 +0530 Subject: [PATCH 38/57] Update Script1.sh --- Script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script1.sh b/Script1.sh index c2a7db19..f54faf04 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,3 +4,4 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-19, We are learning Develops" +echo "My name is Rock" From d2777dc05756c450b0047dd2e0e4c6a1c6f5a565 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 14 Jul 2023 03:58:50 +0000 Subject: [PATCH 39/57] testing --- Script1.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index a85c28b8..2b714f86 100644 --- a/Script1.sh +++ b/Script1.sh @@ -7,4 +7,5 @@ echo "Hello batch-19, We are learning Develops" echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" -echo "My name is Rock" \ No newline at end of file +echo "My name is Rock" +echo "Hello batch-19" From 0efc2b53bd2ead9c88c29715fe628bc04886de1c Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Fri, 15 Sep 2023 07:58:06 +0530 Subject: [PATCH 40/57] This is my fist commit for batch-20 --- Script1.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Script1.sh b/Script1.sh index 2b714f86..4b55ba9b 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,8 +4,4 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-19, We are learning Develops" -echo "Hello All, Welcome to AWS/Devops Class" -echo "Hello, How are you?" -echo "Welcome to Young Minds" -echo "My name is Rock" -echo "Hello batch-19" +echo "Hello Batch-20" \ No newline at end of file From 12c08642465e6fcd56e247e231729995d329fa8f Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Fri, 15 Sep 2023 08:09:12 +0530 Subject: [PATCH 41/57] THis is my 2nd commit --- Script2.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Script2.sh b/Script2.sh index 07ff2a22..4a8343b4 100644 --- a/Script2.sh +++ b/Script2.sh @@ -5,6 +5,4 @@ read a echo "Value of b" read b echo "Hello value of a is $a and value of b is $b" -echo "This is sample change" -echo "bye" -echo "hi" \ No newline at end of file +echo "We are performing this practical for batch-20" From d74b9b5509b14ba435736559ff7483e3740041c3 Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Sat, 16 Sep 2023 08:15:07 +0530 Subject: [PATCH 42/57] I am commiting this change in feature branch --- Script1.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index 4b55ba9b..c38a1187 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,4 +4,6 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-19, We are learning Develops" -echo "Hello Batch-20" \ No newline at end of file +echo "Hello Batch-20" +echo "We are modifying this code in feature" +echo "We are learning branching strategies" \ No newline at end of file From ee1ec8bbfef17962fa3c1c2c43c58aa0885117f5 Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Sat, 16 Sep 2023 08:26:43 +0530 Subject: [PATCH 43/57] Fix for ticket INC007896 --- Script1.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Script1.sh b/Script1.sh index c38a1187..c502df6b 100644 --- a/Script1.sh +++ b/Script1.sh @@ -5,5 +5,5 @@ echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-19, We are learning Develops" echo "Hello Batch-20" -echo "We are modifying this code in feature" -echo "We are learning branching strategies" \ No newline at end of file +#echo "We are modifying this code in feature" +#echo "We are learning branching strategies" \ No newline at end of file From 4f0334921084cb4301cb1465376e8d826795e54d Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Sat, 16 Sep 2023 08:37:45 +0530 Subject: [PATCH 44/57] I am trying to create merge conflict --- Script1.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Script1.sh b/Script1.sh index c502df6b..316fba93 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,6 +4,6 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-19, We are learning Develops" -echo "Hello Batch-20" -#echo "We are modifying this code in feature" -#echo "We are learning branching strategies" \ No newline at end of file +echo "We are trying to help you" +echo "We are creating merge conflict to learn how to solve it" +echo "I am from batch-20." \ No newline at end of file From bb6246d623832463824b25a7baa3f5d03db927dc Mon Sep 17 00:00:00 2001 From: sohansatpute Date: Sat, 16 Sep 2023 08:41:10 +0530 Subject: [PATCH 45/57] Committing this change for merge conflict --- Script1.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Script1.sh b/Script1.sh index 316fba93..2c2e7044 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,6 +4,5 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-19, We are learning Develops" -echo "We are trying to help you" -echo "We are creating merge conflict to learn how to solve it" -echo "I am from batch-20." \ No newline at end of file +echo "Hello, how are you?" +echo "we are learning shells script" \ No newline at end of file From 13afd1cd1bbefb239c1f65dbefe11793b1afcb57 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Sat, 16 Sep 2023 08:43:39 +0530 Subject: [PATCH 46/57] Update Script1.sh --- Script1.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Script1.sh b/Script1.sh index 2c2e7044..e0b72528 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,5 +4,5 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-19, We are learning Develops" -echo "Hello, how are you?" -echo "we are learning shells script" \ No newline at end of file +echo "We creating this change to test merge conflict" +echo "This is another branch, with differnet user" From 4801d32e33a5a0c4472088f15c8973e33b4d28e7 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Sat, 16 Sep 2023 08:45:28 +0530 Subject: [PATCH 47/57] Update Script1.sh --- Script1.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index 2c2e7044..cc2a8b38 100644 --- a/Script1.sh +++ b/Script1.sh @@ -5,4 +5,6 @@ echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-19, We are learning Develops" echo "Hello, how are you?" -echo "we are learning shells script" \ No newline at end of file +echo "we are learning shells script" +echo "Hello, how are you?" +echo "Now we will face merge" From 1804762acc87566572c37c3adad16db31621cbf5 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Sat, 16 Sep 2023 08:53:07 +0530 Subject: [PATCH 48/57] Update Script1.sh --- Script1.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Script1.sh b/Script1.sh index 85c3bfbb..f3c85e2f 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,8 +4,7 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-19, We are learning Develops" -echo "Hello, how are you?" -echo "we are learning shells script" -echo "Hello, how are you?" -echo "Now we will face merge" - +echo "husband: Hello, Lets travel Lonavala" +echo "husband: What you say?" +echo "Wife: No, Lets travel Matheran" +echo "husband: No" From 14a57141b8c8cc2b6f8838424fd9b86d66d21012 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Sat, 16 Sep 2023 08:55:54 +0530 Subject: [PATCH 49/57] Update Script1.sh --- Script1.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Script1.sh b/Script1.sh index 85c3bfbb..b03405ed 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,8 +4,8 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-19, We are learning Develops" -echo "Hello, how are you?" -echo "we are learning shells script" -echo "Hello, how are you?" +echo "wife: Lets travel Matheran?" +echo "husband: No, Lets travel matheran next week" +echo "wife: No" echo "Now we will face merge" From 9ea11720c98ecf409cf96136214c25e8b2904113 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 18 Sep 2023 02:12:08 +0000 Subject: [PATCH 50/57] Deleted 2 lines --- Script1.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/Script1.sh b/Script1.sh index 9ded62d9..c2a7db19 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,5 +4,3 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-19, We are learning Develops" -echo "husband: No, Lets travel matheran next week" -echo "Lets travel lonavala this weekend" From 9462321a66b8814ffa630302f073aae3b9445be7 Mon Sep 17 00:00:00 2001 From: Young Minds <109673364+ygminds73@users.noreply.github.com> Date: Fri, 22 Sep 2023 08:16:11 +0530 Subject: [PATCH 51/57] Update Script1.sh --- Script1.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index c2a7db19..07357f15 100644 --- a/Script1.sh +++ b/Script1.sh @@ -3,4 +3,4 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" -echo "Hello batch-19, We are learning Develops" +echo "Hello batch-20, We are learning Jenkins" From bbbc8cabec4925b06345634cb73ccc1a6e592247 Mon Sep 17 00:00:00 2001 From: ssgaik752 <127913640+ssgaik752@users.noreply.github.com> Date: Wed, 18 Oct 2023 14:53:03 +0530 Subject: [PATCH 52/57] Update Script1.sh --- Script1.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Script1.sh b/Script1.sh index 07357f15..177e55c5 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,3 +4,5 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-20, We are learning Jenkins" +echo"good bye" +echo"good" From 4a184d6ae76809f8ea21fa00a924ea02a421223b Mon Sep 17 00:00:00 2001 From: ssgaik752 <127913640+ssgaik752@users.noreply.github.com> Date: Wed, 18 Oct 2023 14:53:40 +0530 Subject: [PATCH 53/57] Update Script1.sh --- Script1.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Script1.sh b/Script1.sh index 07357f15..2cce3168 100644 --- a/Script1.sh +++ b/Script1.sh @@ -4,3 +4,5 @@ echo "Hello All, Welcome to AWS/Devops Class" echo "Hello, How are you?" echo "Welcome to Young Minds" echo "Hello batch-20, We are learning Jenkins" +echo "Jack" +echo "How are you" From 619772bfddc35c706ad2a6931a39c8e1d0d594bd Mon Sep 17 00:00:00 2001 From: SAURABH GAIKWAD Date: Tue, 31 Oct 2023 14:02:24 +0530 Subject: [PATCH 54/57] Sprint99 --- Script1.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Script1.sh b/Script1.sh index 53a9b831..6565a80f 100644 --- a/Script1.sh +++ b/Script1.sh @@ -8,4 +8,5 @@ echo "Jack" echo "How are you" echo"good bye" echo"good" - +echo "There is something" +echo "we have to validate it" From ae101951ef7b4037bba5a8f9690dfd2ec18f3e52 Mon Sep 17 00:00:00 2001 From: Sagar Gopale Date: Sat, 30 Nov 2024 16:22:02 +0530 Subject: [PATCH 55/57] this is my first check --- Script1.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script1.sh b/Script1.sh index 6565a80f..3adeeab9 100644 --- a/Script1.sh +++ b/Script1.sh @@ -10,3 +10,4 @@ echo"good bye" echo"good" echo "There is something" echo "we have to validate it" +echo "Good to see you here" From 64d726b6786fab89f3bc69cf5afebc8823f16353 Mon Sep 17 00:00:00 2001 From: Sagar Gopale Date: Sat, 30 Nov 2024 16:52:12 +0530 Subject: [PATCH 56/57] New enhancement --- Script19.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Script19.sh b/Script19.sh index cc4cf194..c4f58bb3 100644 --- a/Script19.sh +++ b/Script19.sh @@ -1 +1,2 @@ new script +echo "Good Morning" From e4a08e1554fa965dceeff523a362a021989b99bd Mon Sep 17 00:00:00 2001 From: Sagar Gopale Date: Sat, 30 Nov 2024 17:19:48 +0530 Subject: [PATCH 57/57] new enhancement --- Script1.sh | 5 +++-- Script2.sh | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Script1.sh b/Script1.sh index 3adeeab9..c3539e5b 100644 --- a/Script1.sh +++ b/Script1.sh @@ -8,6 +8,7 @@ echo "Jack" echo "How are you" echo"good bye" echo"good" -echo "There is something" -echo "we have to validate it" +echo "There is nothing" +echo "we have to ignore it" echo "Good to see you here" +echo "Good to see you here b" \ No newline at end of file diff --git a/Script2.sh b/Script2.sh index 4a8343b4..94bf0468 100644 --- a/Script2.sh +++ b/Script2.sh @@ -1,8 +1,8 @@ #!/bin/bash #This script is to read input from the user/console -echo "Value of a" -read a echo "Value of b" read b -echo "Hello value of a is $a and value of b is $b" -echo "We are performing this practical for batch-20" +echo "Value of a" +read a +echo "Hello value of a is $b and value of b is $a" +echo "We are performing this practical for batch-21"