From 86f183d5024b6d3c634ada5984b7d0c014343586 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Thu, 17 Oct 2024 09:21:22 -0700 Subject: [PATCH] Format shell scripts consistently in this repository (#3791) --- local-test.sh | 2 +- .../bom-get-branch-protection.sh | 8 ++-- release-manager-scripts/bom-line-test.sh | 10 ++--- release-manager-scripts/bom-lock-master.sh | 30 ++++++------- .../bom-release-issue-add-release-comment.sh | 10 ++--- .../bom-release-issue-close.sh | 10 ++--- .../bom-release-issue-create.sh | 43 ++++++++++--------- .../bom-release-issue-job-running.sh | 10 ++--- release-manager-scripts/bom-test-all-lines.sh | 10 ++--- release-manager-scripts/bom-unlock-master.sh | 30 ++++++------- 10 files changed, 82 insertions(+), 81 deletions(-) diff --git a/local-test.sh b/local-test.sh index f63627a08..83fb91585 100755 --- a/local-test.sh +++ b/local-test.sh @@ -24,7 +24,7 @@ else EXTRA_MAVEN_PROPERTIES= fi -if [[ "${DOCKERIZED-}" == "true" ]]; then +if [[ ${DOCKERIZED-} == "true" ]]; then docker volume inspect m2repo || docker volume create m2repo docker run \ -v ~/.m2:/var/maven/.m2 \ diff --git a/release-manager-scripts/bom-get-branch-protection.sh b/release-manager-scripts/bom-get-branch-protection.sh index 8b6c352d4..103951059 100755 --- a/release-manager-scripts/bom-get-branch-protection.sh +++ b/release-manager-scripts/bom-get-branch-protection.sh @@ -2,7 +2,7 @@ git checkout master git pull gh api \ - -H "Accept: application/vnd.github+json" \ - -H "X-GitHub-Api-Version: 2022-11-28" \ - /repos/jenkinsci/bom/branches/master/protection \ - --jq ".lock_branch" + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + /repos/jenkinsci/bom/branches/master/protection \ + --jq ".lock_branch" diff --git a/release-manager-scripts/bom-line-test.sh b/release-manager-scripts/bom-line-test.sh index 60ae9d555..ee867d7ec 100755 --- a/release-manager-scripts/bom-line-test.sh +++ b/release-manager-scripts/bom-line-test.sh @@ -1,9 +1,9 @@ #!/bin/bash -if [ $# -ne 2 ]; then - echo "Error: This script requires exactly two arguments." - echo "./bom-line-test.sh " - exit 1 +if [[ $# -ne 2 ]]; then + echo "Error: This script requires exactly two arguments." + echo "./bom-line-test.sh " + exit 1 fi -LINE=$1 PLUGINS=$2 TEST=InjectedTest bash ../local-test.sh \ No newline at end of file +LINE=$1 PLUGINS=$2 TEST=InjectedTest bash ../local-test.sh diff --git a/release-manager-scripts/bom-lock-master.sh b/release-manager-scripts/bom-lock-master.sh index 08a9ad89e..85e0cd279 100755 --- a/release-manager-scripts/bom-lock-master.sh +++ b/release-manager-scripts/bom-lock-master.sh @@ -1,25 +1,25 @@ #!/bin/bash -if [ $# -ne 1 ]; then - echo "Error: This script requires exactly one argument." - echo "./bom-lock-master.sh " - exit 1 +if [[ $# -ne 1 ]]; then + echo "Error: This script requires exactly one argument." + echo "./bom-lock-master.sh " + exit 1 fi git checkout master git pull gh api \ - /repos/jenkinsci/bom/branches/master/protection \ - --method PUT \ - --header "Accept: application/vnd.github+json" \ - --header "X-GitHub-Api-Version: 2022-11-28" \ - -F "lock_branch=true" \ - -F "enforce_admins=false" \ - -F "required_pull_request_reviews=null" \ - -F "required_status_checks[strict]=false" \ - -f "required_status_checks[contexts][]=Jenkins" \ - -F "restrictions=null" \ - --silent + /repos/jenkinsci/bom/branches/master/protection \ + --method PUT \ + --header "Accept: application/vnd.github+json" \ + --header "X-GitHub-Api-Version: 2022-11-28" \ + -F "lock_branch=true" \ + -F "enforce_admins=false" \ + -F "required_pull_request_reviews=null" \ + -F "required_status_checks[strict]=false" \ + -f "required_status_checks[contexts][]=Jenkins" \ + -F "restrictions=null" \ + --silent updatedBody=$(gh issue view $1 --json body --jq ".body" | sed 's/\[\ \] Lock/[x] Lock/') gh issue edit $1 --body $updatedBody diff --git a/release-manager-scripts/bom-release-issue-add-release-comment.sh b/release-manager-scripts/bom-release-issue-add-release-comment.sh index b8e013eab..4f1c63cb3 100755 --- a/release-manager-scripts/bom-release-issue-add-release-comment.sh +++ b/release-manager-scripts/bom-release-issue-add-release-comment.sh @@ -1,12 +1,12 @@ #!/bin/bash -if [ $# -ne 1 ]; then - echo "Error: This script requires exactly one argument." - echo "./bom-release-issue-add-release-comment.sh " - exit 1 +if [[ $# -ne 1 ]]; then + echo "Error: This script requires exactly one argument." + echo "./bom-release-issue-add-release-comment.sh " + exit 1 fi git checkout master git pull releaseName=$(gh release list --limit 1 --json isLatest,name --jq ".[].name") -gh issue comment $1 --body "New release: [https://github.com/jenkinsci/bom/releases/tag/$releaseName](https://github.com/jenkinsci/bom/releases/tag/$releaseName)" \ No newline at end of file +gh issue comment $1 --body "New release: [https://github.com/jenkinsci/bom/releases/tag/$releaseName](https://github.com/jenkinsci/bom/releases/tag/$releaseName)" diff --git a/release-manager-scripts/bom-release-issue-close.sh b/release-manager-scripts/bom-release-issue-close.sh index 1a716278a..4a3efa537 100755 --- a/release-manager-scripts/bom-release-issue-close.sh +++ b/release-manager-scripts/bom-release-issue-close.sh @@ -1,12 +1,12 @@ #!/bin/bash -if [ $# -ne 1 ]; then - echo "Error: This script requires exactly one argument." - echo "./bom-release-issue-close.sh " - exit 1 +if [[ $# -ne 1 ]]; then + echo "Error: This script requires exactly one argument." + echo "./bom-release-issue-close.sh " + exit 1 fi git checkout master git pull gh issue unpin $1 -gh issue close $1 \ No newline at end of file +gh issue close $1 diff --git a/release-manager-scripts/bom-release-issue-create.sh b/release-manager-scripts/bom-release-issue-create.sh index 405af87e7..98bab8178 100755 --- a/release-manager-scripts/bom-release-issue-create.sh +++ b/release-manager-scripts/bom-release-issue-create.sh @@ -1,32 +1,33 @@ #!/bin/bash -if [ $# -ne 2 ]; then - echo "Error: This script requires exactly two arguments." - echo "./bom-release-issue-create.sh " - exit 1 +if [[ $# -ne 2 ]]; then + echo "Error: This script requires exactly two arguments." + echo "./bom-release-issue-create.sh " + exit 1 fi git checkout master git pull releaseManager=$2 -bodyValue=$(cat <<-EOM -A new release is being scheduled. -Release manager: @$2 +bodyValue=$( + cat <<-EOM + A new release is being scheduled. + Release manager: @$2 -# Release progress -- [ ] Lock primary branch -- [ ] Trigger [Jenkins build](https://ci.jenkins.io/job/Tools/job/bom/job/master/BUILDNUMBER/) -- [ ] Unlock primary branch -EOM + # Release progress + - [ ] Lock primary branch + - [ ] Trigger [Jenkins build](https://ci.jenkins.io/job/Tools/job/bom/job/master/BUILDNUMBER/) + - [ ] Unlock primary branch + EOM ) issueNumber=$(gh api \ - --method POST \ - -H "Accept: application/vnd.github+json" \ - -H "X-GitHub-Api-Version: 2022-11-28" \ - /repos/jenkinsci/bom/issues \ - -f "title=[RELEASE] New release for $1" \ - -f "body=$bodyValue" \ - -f "assignees[]=$2" \ - --jq ".number") + --method POST \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + /repos/jenkinsci/bom/issues \ + -f "title=[RELEASE] New release for $1" \ + -f "body=$bodyValue" \ + -f "assignees[]=$2" \ + --jq ".number") echo $issueNumber -gh issue pin $issueNumber \ No newline at end of file +gh issue pin $issueNumber diff --git a/release-manager-scripts/bom-release-issue-job-running.sh b/release-manager-scripts/bom-release-issue-job-running.sh index 932fb5bc6..71380d1f3 100755 --- a/release-manager-scripts/bom-release-issue-job-running.sh +++ b/release-manager-scripts/bom-release-issue-job-running.sh @@ -1,12 +1,12 @@ #!/bin/bash -if [ $# -ne 2 ]; then - echo "Error: This script requires exactly two arguments." - echo "./bom-release-issue-job-running.sh " - exit 1 +if [[ $# -ne 2 ]]; then + echo "Error: This script requires exactly two arguments." + echo "./bom-release-issue-job-running.sh " + exit 1 fi git checkout master git pull updatedBody=$(gh issue view $1 --json body --jq ".body" | sed 's/\[\ \] Trigger/[x] Trigger/' | sed "s/BUILDNUMBER/$2/") -gh issue edit $1 --body $updatedBody \ No newline at end of file +gh issue edit $1 --body $updatedBody diff --git a/release-manager-scripts/bom-test-all-lines.sh b/release-manager-scripts/bom-test-all-lines.sh index 5f1c27ceb..0b41171e7 100755 --- a/release-manager-scripts/bom-test-all-lines.sh +++ b/release-manager-scripts/bom-test-all-lines.sh @@ -1,12 +1,12 @@ #!/bin/bash -if [ $# -ne 1 ]; then - echo "Error: This script requires exactly one argument." - echo "./bom-test-all-lines.sh " - exit 1 +if [[ $# -ne 1 ]]; then + echo "Error: This script requires exactly one argument." + echo "./bom-test-all-lines.sh " + exit 1 fi ./bom-line-test.sh weekly $1 ./bom-line-test.sh 2.479.x $1 ./bom-line-test.sh 2.462.x $1 -./bom-line-test.sh 2.452.x $1 \ No newline at end of file +./bom-line-test.sh 2.452.x $1 diff --git a/release-manager-scripts/bom-unlock-master.sh b/release-manager-scripts/bom-unlock-master.sh index 868d0c1ac..575f24156 100755 --- a/release-manager-scripts/bom-unlock-master.sh +++ b/release-manager-scripts/bom-unlock-master.sh @@ -1,25 +1,25 @@ #!/bin/bash -if [ $# -ne 1 ]; then - echo "Error: This script requires exactly one argument." - echo "./bom-unlock-master.sh " - exit 1 +if [[ $# -ne 1 ]]; then + echo "Error: This script requires exactly one argument." + echo "./bom-unlock-master.sh " + exit 1 fi git checkout master git pull gh api \ - /repos/jenkinsci/bom/branches/master/protection \ - --method PUT \ - --header "Accept: application/vnd.github+json" \ - --header "X-GitHub-Api-Version: 2022-11-28" \ - -F "lock_branch=false" \ - -F "enforce_admins=false" \ - -F "required_pull_request_reviews=null" \ - -F "required_status_checks[strict]=false" \ - -f "required_status_checks[contexts][]=Jenkins" \ - -F "restrictions=null" \ - --silent + /repos/jenkinsci/bom/branches/master/protection \ + --method PUT \ + --header "Accept: application/vnd.github+json" \ + --header "X-GitHub-Api-Version: 2022-11-28" \ + -F "lock_branch=false" \ + -F "enforce_admins=false" \ + -F "required_pull_request_reviews=null" \ + -F "required_status_checks[strict]=false" \ + -f "required_status_checks[contexts][]=Jenkins" \ + -F "restrictions=null" \ + --silent updatedBody=$(gh issue view $1 --json body --jq ".body" | sed 's/\[\ \] Unlock/[x] Unlock/') gh issue edit $1 --body $updatedBody