From d7e1d18b378efe387f066d982d092c19464b09b5 Mon Sep 17 00:00:00 2001
From: Marc Cataford <mcat@riseup.net>
Date: Fri, 11 Nov 2022 19:44:21 -0500
Subject: [PATCH] feat: git & gpg setup (#1)

---
 git_config     |  3 +++
 setup          | 17 ++++++++++++++++-
 source/exports |  5 +++++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 git_config
 create mode 100644 source/exports

diff --git a/git_config b/git_config
new file mode 100644
index 0000000..da2e75b
--- /dev/null
+++ b/git_config
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+git config --global commit.gpgsign true
diff --git a/setup b/setup
index 8731532..f21de17 100644
--- a/setup
+++ b/setup
@@ -1,12 +1,14 @@
 #!/bin/bash
 
+set -e
+
 #
 # Detects the current shell (bash, zsh, ...) and adds, if necessary, a managed
 # block to its configuration to source extra files on shell-start.
 #
 
 BLOCK_DELIMITER_PATTERN="mcataford/env-managed-block"
-
+WORKING_PATH=$(realpath $(dirname $0))
 SHELL_CONFIG_PATH=""
 
 if [[ -n $(echo $SHELL | grep zsh) ]]; then
@@ -15,16 +17,21 @@ else
     SHELL_CONFIG_PATH="$HOME/.bashrc"
 fi
 
+echo "Setting up shell configuration extras..."
 if [[ -z $(cat $SHELL_CONFIG_PATH | grep $BLOCK_DELIMITER_PATTERN) ]]; then
     echo "# $BLOCK_DELIMITER_PATTERN:start
 for f in ~/.env_goodies/source/*; do source $f; done
 # $BLOCK_DELIMITER_PATTERN:end" >> $SHELL_CONFIG_PATH
+    echo "✅ Added managed block to $SHELL_CONFIG_PATH"
+else
+    echo "No changes to apply!"
 fi
 
 EDITOR_CONFIG=$HOME/.config/nvim
 EDITOR_CONFIG_FILE=$EDITOR_CONFIG/init.vim
 
 if [[ -f $EDITOR_CONFIG_FILE ]]; then
+    echo "Setting up NVIM configuration extras..."
     if [[ -z $(cat $EDITOR_CONFIG_FILE | grep $BLOCK_DELIMITER_PATTERN) ]]; then
         echo "\" $BLOCK_DELIMITER_PATTERN:start
 source $HOME/.env_goodies/extras.vim
@@ -33,5 +40,13 @@ source $HOME/.env_goodies/extras.vim
 
         mv $EDITOR_CONFIG_FILE $EDITOR_CONFIG_FILE.old
         mv $EDITOR_CONFIG_FILE.new $EDITOR_CONFIG_FILE
+        echo "✅ Added managed block to $EDITOR_CONFIG_FILE"
+    else
+        echo "No changes to apply!"
     fi
 fi
+
+echo "Setting up git configuration..."
+source $WORKING_PATH/git_config
+echo "✅ Set up git configuration, see $WORKING_PATH/git_config for details!"
+
diff --git a/source/exports b/source/exports
new file mode 100644
index 0000000..31b41f4
--- /dev/null
+++ b/source/exports
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Ensures that passphrases can be entered when signing
+# git commits.
+export GPG_TTY=$(tty)