diff --git a/Script1.sh b/Script1.sh deleted file mode 100644 index 970b10cc..00000000 --- a/Script1.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -#This is my 1st shell script to print output -echo "Hello All, Welcome to AWS/Devops Class" -echo "Hello, How are you?" 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" diff --git a/Script12.sh b/Script12.sh index d75af12d..1bca0b03 100644 --- a/Script12.sh +++ b/Script12.sh @@ -1,24 +1,4 @@ #!/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" @@ -26,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 @@ -34,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 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 ] 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 diff --git a/Script2.sh b/Script2.sh index d507e753..7776ac9a 100644 --- a/Script2.sh +++ b/Script2.sh @@ -5,4 +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" + diff --git a/Script4.sh b/Script4.sh index c016e2bf..658b4e30 100644 --- a/Script4.sh +++ b/Script4.sh @@ -1,6 +1,9 @@ #!/bin/bash #This is creation and calling of shell variable --- defining variables Class=Young-minds -Batch=13 -PROFESSION=AWS/DevOps +Batch=25 +PROFESSION=AWS/DevSecOps/Azure DevOps echo "Class Name is $Class, Batch number $Batch, We are learning $PROFESSION" +echo "we are learning different statergy" +echo "we r trying to help you" +echo "i am from batch24" \ No newline at end of file diff --git a/Script8.sh b/Script8.sh index 3d246692..c8a713cf 100644 --- a/Script8.sh +++ b/Script8.sh @@ -27,3 +27,4 @@ then else echo "None of the condition met" fi + diff --git a/end b/end new file mode 100644 index 00000000..37cab0da --- /dev/null +++ b/end @@ -0,0 +1,152 @@ +e20f6e4 (HEAD -> main) This is my first commit for batch 20 +4c2a5b4 (origin/main, origin/HEAD) Merge pull request #334 from ygminds73/b2 +93c801a Merge branch 'main' into b2 +dfc6234 Merge pull request #333 from ygminds73/b1 +2f99e3a Update script1.sh +a46b485 Update script1.sh +e343d0b Sample commit +ce4dae1 Merge pull request #326 from ygminds73/INC0902324 +800873d This chnage is for incident-INC0902324 +a9a7805 This is my first commit in batch-24 +5b5954d Update Script4.sh +169b522 Delete file1 +f2ddc67 Merge pull request #291 from ygminds73/b2 +cd4d215 Merge branch 'main' into b2 +76c1037 Merge pull request #292 from ygminds73/b1 +d2f55d4 Update file1 +c254be2 Merge pull request #290 from ygminds73/b1 +d31b9c1 Update file1 +943acfc Update file1 +3ca0d95 Merge pull request #288 from ygminds73/b2 +894ef0b Update file1 +f92a3bc Update file1 +b701467 Create file1 +4f047ad Update script1.sh +89b1abb Create script1.sh +1f406d0 Delete echo "We are trying this practical from linux EC2" echo "We are from batch-24 and learning git directory +f1e4b39 Create script1.sh +9108f6a Merge pull request #277 from ygminds73/delete +11bb864 We have deleted 1 script file +115c17b Merge pull request #276 from ygminds73/REQ9865634 +e427931 code changes for req- REQ9865634 +2fbd565 Merge pull request #275 from ygminds73/batch-23 +166ad0c Update Script1.sh +fd0cefe Update Script1.sh +20526d5 2nd commit for batch-23 +c53dd8a This is my first commit for batch-23 +d8c8353 Adding code +051ec25 Update Script1.sh +da2ea2d Merge pull request #250 from ygminds73/REQ092348 +ac03604 Request commit +cb6b94d Modifying Script2 +fe5ba34 This is my sample commit 2nd +98a77b2 this is my first commit +29141b7 Update Script1.sh +53f56a2 Merge pull request #207 from ygminds73/REQ0044435 +7fc5b3f We are learning git merge +df321a9 Removed fake commits +1c82999 i am commiting this change as sample +feb0344 Update Script1.sh +9462321 Update Script1.sh +9ea1172 Deleted 2 lines +b6f946f Merge pull request #179 from ygminds73/hotfix-2 +e4e05dc Merge branch 'main' into hotfix-2 +43eb8ac Merge pull request #178 from ygminds73/hotfix-1 +14a5714 Update Script1.sh +1804762 Update Script1.sh +738bbdf Merge pull request #177 from ygminds73/feature-2 +aac571f Merge branch 'main' into feature-2 +4801d32 Update Script1.sh +4571a7b Merge pull request #176 from ygminds73/feature-3 +13afd1c Update Script1.sh +2e4816e Merge pull request #175 from ygminds73/feature-2 +bb6246d Committing this change for merge conflict +b99b225 Merge pull request #174 from ygminds73/INC0007896 +4f03349 I am trying to create merge conflict +5c56b4b Merge pull request #173 from ygminds73/INC0007896 +ee1ec8b Fix for ticket INC007896 +4b828f3 Merge pull request #172 from ygminds73/feature-1 +d74b9b5 I am commiting this change in feature branch +12c0864 THis is my 2nd commit +0efc2b5 This is my fist commit for batch-20 +d2777dc testing +580df6b Merge pull request #115 from ygminds73/aws-devops-2 +706282f Merge branch 'main' into aws-devops-2 +8288fa8 Merge pull request #114 from ygminds73/aws-devops-1 +fe1a81c Update Script1.sh +a666719 Update Script1.sh +de2c933 Update Script1.sh +b07385d Merge pull request #113 from ygminds73/yg-batch-19 +c45c9b0 Update Script1.sh +f4f2156 This is my commit +aa051ac Update Script1.sh +a05aac5 Update Script1.sh +41409c9 adding +75f85cc Merge pull request #83 from ygminds73/dev-1 +0277c1f Merge branch 'main' into dev-1 +7436e3e Merge pull request #82 from ygminds73/dev-2 +c18078c Update Script1.sh +1d1ed7d Update Script1.sh +8fad04d Merge pull request #78 from ygminds73/may +5dfd283 new branch commit +c02181d Merge pull request #77 from ygminds73/mybranchgit +e959ce0 Update Script1.sh +7a7d9fc Merge pull request #76 from ygminds73/mybranchgit +b0c900a Update Script1.sh +d69e7eb Update Script1.sh +b3d85c9 Merge pull request #75 from ygminds73/mybranchgit +050da8b Update Script11.sh +36e9a10 Merge pull request #74 from ygminds73/batch-18 +5f8f702 Update Script1.sh +c8a72e5 this is my 3rd commit +e7d8855 This is my 2nd commit +247a1cf This is my first commit +5c8152a Merge pull request #50 from ygminds73/test +718c06d Merge branch 'main' into test +03f4d9a This is another commit +f83565f We did few changes in test branch +0600338 Merge pull request #44 from ygminds73/aws +1fc77b1 Update Script1.sh +93508e0 This is my todays first commit +374d03f This is my 2nd commit +efa99be This is my first commit +199edbf Update Script13.sh +3522907 Update Script12.sh +af9b7ed Update Script12.sh +e76d21c This is for fix - Incident ID +e4f9a16 Merge pull request #21 from ygminds73/REQ583298 +a7ab09c This changes are for user request-REQ583298 +aaaca80 Merge pull request #19 from ygminds73/batch-20 +50f4afd Merge branch 'main' into batch-20 +c7c974d Merge pull request #18 from ygminds73/batch-21 +8e86590 Update Script1.sh +a85657f Update Script1.sh +6ed411c I have changed 2 script- script1 & Script2 +5f49d89 Update Script12.sh +bedea44 this is my last commit +87fd07e Merge pull request #2 from ygminds73/new +fddbb73 this change is for req- REQ660982 +6e852c0 Merge pull request #1 from ygminds73/b1 +8376b0e first commit +9fa7c29 fake commit-ticketID +70519c9 this is my 2nd commit +4863e8f Changes in script1 +5289094 This is my first commit +6c6df31 Create Script18.sh +4262bce Create Script17.sh +c9fc185 Create Script16.sh +6cf2c5c Create Script15.sh +80552d5 Create Script14.sh +bfbce34 Create Script13.sh +3007601 Create Script12.sh +2b30382 Create Script11.sh +ba6bf64 Create Scrpit10.sh +efaea09 Create Script9.sh +984004b Create Script8.sh +6d4c2b6 Create Script7.sh +06ac113 Create Script6.sh +bd6ca0a Create Script5.sh +90e5398 Create Script4.sh +f0a7b5d Create Script3.sh +22b3ced Create Script2.sh +74f76a1 Create Script1.sh diff --git a/script1.sh b/script1.sh new file mode 100644 index 00000000..0bb2d686 --- /dev/null +++ b/script1.sh @@ -0,0 +1,8 @@ +echo "We are trying this practical from linux EC2" +echo "We are from batch-24 and learning git/gihub" +echo "Happy weekend" +echo "My name is kavya" +echo "we learning Full stack devlops" +echo "i am trying to don't create merge conflicts" +echo "this scrpit-first" +echo "This is my last year to serve Damm Cellular system india pvt ltd" \ No newline at end of file