chore(style): convert blocks into functions (see #325)

[webi-installers/.git] / git-config-gpg / git-config-gpg.sh

diff --git a/git-config-gpg/git-config-gpg.sh b/git-config-gpg/git-config-gpg.sh
index 3b38745bb01c789085887e7c6f111cc20241d1d6..324bd000a8521da74a917306f3e6744f0427853b 100644 (file)
--- a/git-config-gpg/git-config-gpg.sh
+++ b/git-config-gpg/git-config-gpg.sh
@@ -2,35 +2,39 @@
 set -e
 set -u
 
-export PATH="$HOME/.local/opt/gnupg/bin:$PATH"
-export PATH="$HOME/.local/opt/gnupg/bin/pinentry-mac.app/Contents/MacOS:$PATH"
+function __git_gpg_init() {
+    export PATH="$HOME/.local/opt/gnupg/bin:$PATH"
+    export PATH="$HOME/.local/opt/gnupg/bin/pinentry-mac.app/Contents/MacOS:$PATH"
 
-# TODO check for public key without gpg-pubkey?
-if ! command -v gpg-pubkey; then
-    webi gpg-pubkey
-else
-    gpg-pubkey
-fi
+    # TODO check for public key without gpg-pubkey?
+    if ! command -v gpg-pubkey; then
+        webi gpg-pubkey
+    else
+        gpg-pubkey
+    fi
 
-MY_KEY_ID="$(
-    gpg-pubkey-id
-)"
+    MY_KEY_ID="$(
+        gpg-pubkey-id
+    )"
 
-echo -n "Enabling automatic git commit signing...
-    git config --global user.signingkey ${MY_KEY_ID}
+    echo -n "Enabling automatic git commit signing...
+           git config --global user.signingkey ${MY_KEY_ID}
+           git config --global commit.gpgsign true
+           git config --global log.showSignature true
+       "
+
+    git config --global user.signingkey "${MY_KEY_ID}"
     git config --global commit.gpgsign true
     git config --global log.showSignature true
-"
 
-git config --global user.signingkey "${MY_KEY_ID}"
-git config --global commit.gpgsign true
-git config --global log.showSignature true
+    echo ""
+    echo "Successfully updated ~/.gitconfig"
+    echo ""
+    echo "How to verify signed commits on GitHub:"
+    echo ""
+    echo "    1. Go to 'Add GPG Key': https://github.com/settings/gpg/new"
+    echo "    2. Copy and paste the key above from the first ---- to the last ----"
+    echo ""
+}
 
-echo ""
-echo "Successfully updated ~/.gitconfig"
-echo ""
-echo "How to verify signed commits on GitHub:"
-echo ""
-echo "    1. Go to 'Add GPG Key': https://github.com/settings/gpg/new"
-echo "    2. Copy and paste the key above from the first ---- to the last ----"
-echo ""
+__git_gpg_init