2 files changed, 17 insertions, 9 deletions
diff --git a/modules/security/gopass/gopass-ssh-load.sh b/modules/security/gopass/gopass-ssh-load.sh
index b9a06e9..8c1b11f 100644
--- a/modules/security/gopass/gopass-ssh-load.sh
+++ b/modules/security/gopass/gopass-ssh-load.sh
@@ -28,11 +28,15 @@ set -o pipefail
 export GNUPGHOME="@@GNUPGHOME@@"
 export GOPASS_SSH_KEYS="@@GOPASS_SSH_KEYS@@"
 
+info()  { printf '\033[1;34m==>\033[0m %s\n' "$*"; }
+warn()  { printf '\033[1;33m==> warning:\033[0m %s\n' "$*" >&2; }
+error() { printf '\033[1;31m==> error:\033[0m %s\n' "$*" >&2; }
+die()   { error "$*"; exit 1; }
+
 SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
 export SSH_AUTH_SOCK
 if [ -z "$SSH_AUTH_SOCK" ] || [ ! -S "$SSH_AUTH_SOCK" ]; then
-  echo "Error: SSH_AUTH_SOCK is not set or valid." >&2
-  exit 1
+  die "SSH_AUTH_SOCK is not set or valid."
 fi
 
 if ssh-add -l 2>/dev/null | grep -qE "(ED25519|RSA|ECDSA)"; then
@@ -41,8 +45,7 @@ fi
 
 # GOPASS_SSH_KEYS holds a space-separated list of gopass entry names under ssh
 if [ -z "${GOPASS_SSH_KEYS:-}" ]; then
-  echo "Error: GOPASS_SSH_KEYS is not set. Example: GOPASS_SSH_KEYS=\"github gitlab\"" >&2
-  exit 1
+  die "GOPASS_SSH_KEYS is not set. Example: GOPASS_SSH_KEYS=\"github gitlab\""
 fi
 
 # shellcheck disable=SC2086
@@ -63,6 +66,6 @@ for key in "${keys[@]}"; do
     ssh-add "$keyfile" 2>/dev/null
     rm -rf "$tmpdir"
   else
-    echo "Warning: no gopass entry ssh/$key" >&2
+    warn "no gopass entry ssh/$key"
   fi
 done
diff --git a/modules/security/gopass/gopass-sync-init.sh b/modules/security/gopass/gopass-sync-init.sh
index c7767f9..e00ce73 100644
--- a/modules/security/gopass/gopass-sync-init.sh
+++ b/modules/security/gopass/gopass-sync-init.sh
@@ -11,19 +11,24 @@
 
 STORE_DIR="@@PASSWORD_STORE_DIR@@"
 
+info()  { printf '\033[1;34m==>\033[0m %s\n' "$*"; }
+warn()  { printf '\033[1;33m==> warning:\033[0m %s\n' "$*" >&2; }
+error() { printf '\033[1;31m==> error:\033[0m %s\n' "$*" >&2; }
+die()   { error "$*"; exit 1; }
+
 mkdir -p "$STORE_DIR"
-cd "$STORE_DIR" || { echo "Failed to enter $STORE_DIR"; exit 1; }
+cd "$STORE_DIR" || die "Failed to enter $STORE_DIR"
 
 # Check if the directory is already a git repository; initialize if not
 if ! git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
-    echo "Initializing git repository in $STORE_DIR..."
+    info "Initializing git repository in $STORE_DIR..."
     git init
 fi
 
 # Check if the remote 'origin' is set; add it if not
 if ! git remote | grep -q "^origin$"; then
-    echo "Adding remote origin..."
+    info "Adding remote origin..."
     git remote add origin "@@REMOTE_REPO_URL@@"
 fi
 
-echo "Password store git setup complete."
+info "Password store git setup complete."