From 4e1d5cfa5daeb5dc71eb231eee52010b4cb1f3b0 Mon Sep 17 00:00:00 2001
From: Paul Hewlett <phewlett76@gmail.com>
Date: Mon, 19 Dec 2022 13:42:53 +0000
Subject: [PATCH] Change company name to RKVST

Company name is now RKVST.

Signed-off-by: Paul Hewlett <phewlett76@gmail.com>
---
 CONTRIBUTING.md         |  6 +++---
 README.md               | 12 ++++++------
 Taskfile.yml            |  4 ++--
 scripts/sbom_scraper.sh | 11 +++++++++--
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4ff944a..ba929ad 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,9 +1,9 @@
-# Contributing to archivist-shell #
+# Contributing to rkvst-shell #
 
-Thanks for taking the time to contribute to archivist-shell!
+Thanks for taking the time to contribute to rkvst-shell!
 
 Contributing is not limited to writing code and submitting a PR. Feel free to submit an
-[issue](https://github.com/jitsuin-inc/archivist-shell/issues/new/choose) or comment on an existing one
+[issue](https://github.com/rkvst/rkvst-shell/issues/new/choose) or comment on an existing one
 to report a bug, provide feedback, or suggest a new feature.
 
 Of course, contributing code is more than welcome! To keep things simple, if you're fixing a small issue,
diff --git a/README.md b/README.md
index e85c554..71cfb54 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# archivist-shell
+# rkvst-shell
 
 Repository for convenience scripts for the RKVST system.
 
@@ -47,21 +47,21 @@ Host *
 ```
 > i.e. 'githubUserHandle' viz:
 >
->    git clone ssh-githubUserHandle:githubUserHandle/archivist-shell.git
+>    git clone ssh-githubUserHandle:githubUserHandle/rkvst-shell.git
 >
 
 
 ```bash
 mkdir githubUserHandle
 cd githubUserHandle
-git clone ssh-githubUserHandle:githubUserHandle/archivist-shell.git
+git clone ssh-githubUserHandle:githubUserHandle/rkvst-shell.git
 ```
 
 Enter the new cloned fork and add the original upstream repo as a remote:
 
 ```bash
-cd archivist-shell
-git remote add upstream ssh-githubUserHandle:jitsuin-inc/archivist-shell.git
+cd rkvst-shell
+git remote add upstream ssh-githubUserHandle:rkvst/rkvst-shell.git
 git remote -v
 ```
 
@@ -138,7 +138,7 @@ Push the changes upstream(the set-upstream option is only required the first tim
 git push --set-upstream origin dev/githubUserHandle/some-proposed-fix
 ```
 
-Enter the github ui at https://github.com/jitsuin-inc/archivist-shell and 
+Enter the github ui at https://github.com/rkvst/rkvst-shell and 
 generate a pull request.
 
 Reviewers will be notified when a PR is generated and you will receive feedback.
diff --git a/Taskfile.yml b/Taskfile.yml
index f3a838e..0b6f003 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -5,7 +5,7 @@ tasks:
   build-scraper:
     desc: Build scraper image
     cmds:
-      - docker build --no-cache -f Dockerfile-scraper -t archivist-shell-scraper .
+      - docker build --no-cache -f Dockerfile-scraper -t rkvst-shell-scraper .
 
   check:
     desc: Standard linting of shell scripts
@@ -27,6 +27,6 @@ tasks:
           -w $(pwd) \
           -u $(id -u):$(id -g) \
           -e USER \
-          archivist-shell-scraper \
+          rkvst-shell-scraper \
           {{.CLI_ARGS}}
 
diff --git a/scripts/sbom_scraper.sh b/scripts/sbom_scraper.sh
index 145c68c..f5c3bbb 100755
--- a/scripts/sbom_scraper.sh
+++ b/scripts/sbom_scraper.sh
@@ -68,7 +68,7 @@ log() {
 # ----------------------------------------------------------------------------
 # Option parsing
 # ----------------------------------------------------------------------------
-TOOL_NAME="https://github.com/jitsuin-inc/archivist-shell sbom_scraper.sh"
+TOOL_NAME="https://github.com/rkvst/rkvst-shell sbom_scraper.sh"
 #
 # Set this value and merge the change just before release
 TOOL_VERSION="v0.6.2"
@@ -177,9 +177,13 @@ TEMPDIR=$( mktemp -d /tmp/.sbom_scraper.XXXXXXXX )
 
 # report on exit
 function finalise {
+    # See exit 0 code at bottom of file.
+    # shellcheck disable=SC2317
     CODE=$?
+    # shellcheck disable=SC2317
     rm -rf "$TEMPDIR"
-    exit $CODE
+    # shellcheck disable=SC2317
+    exit "$CODE"
 }
 trap finalise EXIT INT TERM
 
@@ -606,4 +610,7 @@ EOF
     fi
     log "Upload success"
 fi
+# this triggers a false shellcheck warning SC2317
+# See https://github.com/koalaman/shellcheck/issues/2542
+# Disabled in the finalise function above.
 exit 0