diff --git a/bin/.bin/load_keys b/bin/.bin/load_keys index 0ae12b9..82f0d6f 100755 --- a/bin/.bin/load_keys +++ b/bin/.bin/load_keys @@ -17,11 +17,12 @@ if [[ ! -d "$ABS_BASE_PATH" ]]; then fi # Loop through each identity subdirectory +echo -n "Injecting ssh keys " while IFS= read -r dir; do IDENTITY=$(basename "$dir") # Find the latest .gpg file by name (ISO sort) - LATEST_FILE=$(find "$dir" -maxdepth 1 -name "*.gpg" -printf "%f\n" \ + LATEST_FILE=$(find "$dir" -maxdepth 1 -name "*.gpg" -exec basename {} \; \ | sed 's/\.gpg$//' \ | sort -r \ | head -n 1) @@ -30,12 +31,10 @@ while IFS= read -r dir; do continue fi - echo "Injecting $IDENTITY ($LATEST_FILE) into ssh-agent..." + echo -n "." # Decrypt and pipe directly to ssh-add # The '-' tells ssh-add to read the key from standard input (stdin) pass show "${PASS_BASE}/${IDENTITY}/${LATEST_FILE}" | ssh-add - >/dev/null 2>&1 done < <(find "$ABS_BASE_PATH" -mindepth 1 -maxdepth 1 -type d) - -echo "Done. All latest keys injected into agent." diff --git a/bin/.bin/load_keys.freebsd b/bin/.bin/load_keys.freebsd deleted file mode 100755 index 9cb7e47..0000000 --- a/bin/.bin/load_keys.freebsd +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -PASS_BASE="personal/ssh" -STORE_ROOT="${PASSWORD_STORE_DIR:-$HOME/.password-store}" -ABS_BASE_PATH="${STORE_ROOT}/${PASS_BASE}" - -# Ensure ssh-agent is running -if [[ -z "${SSH_AUTH_SOCK:-}" ]]; then - eval "$(ssh-agent -s)" -fi - -# Verify the base path exists -if [[ ! -d "$ABS_BASE_PATH" ]]; then - echo "ERROR: Base path not found in pass: $PASS_BASE" >&2 - exit 1 -fi - -# Loop through each identity subdirectory -while IFS= read -r dir; do - IDENTITY=$(basename "$dir") - - # Find the latest .gpg file by name (ISO sort) - LATEST_FILE=$(find "$dir" -maxdepth 1 -name "*.gpg" -exec basename {} \; \ - | sed 's/\.gpg$//' \ - | sort -r \ - | head -n 1) - - if [[ -z "$LATEST_FILE" ]]; then - continue - fi - - echo "Injecting $IDENTITY ($LATEST_FILE) into ssh-agent..." - - # Decrypt and pipe directly to ssh-add - # The '-' tells ssh-add to read the key from standard input (stdin) - pass show "${PASS_BASE}/${IDENTITY}/${LATEST_FILE}" | ssh-add - >/dev/null 2>&1 - -done < <(find "$ABS_BASE_PATH" -mindepth 1 -maxdepth 1 -type d) - -echo "Done. All latest keys injected into agent."