feat: normalize key names to lowercase and handle single quotes in SOPS public key extraction
This commit is contained in:
4 files changed
+10
-7
No files matched your search
@@ -5,7 +5,8 @@ init-dotenv-sops() {
|
||||
project_name=$(basename -s .git "$(git remote get-url origin 2>/dev/null)" 2>/dev/null)
|
||||
project_name=${project_name:-${PWD##*/}}
|
||||
|
||||
local key_name="${1:-$project_name}"
|
||||
local key_name
|
||||
key_name=$(echo "${1:-$project_name}" | tr '[:upper:]' '[:lower:]')
|
||||
local age_dir="$HOME/.config/sops/age"
|
||||
local age_key_file="$age_dir/keys.txt"
|
||||
|
||||
@@ -13,7 +14,7 @@ init-dotenv-sops() {
|
||||
|
||||
local public_key=""
|
||||
if [[ -f ".sops.yaml" ]]; then
|
||||
public_key=$(grep -E '^[[:space:]]*age:' ".sops.yaml" | head -1 | awk '{print $2}' | tr -d '"')
|
||||
public_key=$(grep -E '^[[:space:]]*age:' ".sops.yaml" | head -1 | awk '{print $2}' | tr -d '"' | tr -d "'")
|
||||
echo ".sops.yaml already exists with public key: $public_key"
|
||||
fi
|
||||
|
||||
|
||||
@@ -28,7 +28,8 @@ load-agekey-from-keepass() {
|
||||
project_name=$(basename -s .git "$(git remote get-url origin 2>/dev/null)" 2>/dev/null)
|
||||
project_name=${project_name:-${PWD##*/}}
|
||||
|
||||
local key_name="${1:-$project_name}"
|
||||
local key_name
|
||||
key_name=$(echo "${1:-$project_name}" | tr '[:upper:]' '[:lower:]')
|
||||
local age_dir="$HOME/.config/sops/age"
|
||||
local age_key_file="$age_dir/keys.txt"
|
||||
local keepass_entry="age/$key_name"
|
||||
|
||||
@@ -31,7 +31,8 @@ store-agekey-to-keepass() {
|
||||
project_name=$(basename -s .git "$(git remote get-url origin 2>/dev/null)" 2>/dev/null)
|
||||
project_name=${project_name:-${PWD##*/}}
|
||||
|
||||
local key_name="${1:-$project_name}"
|
||||
local key_name
|
||||
key_name=$(echo "${1:-$project_name}" | tr '[:upper:]' '[:lower:]')
|
||||
local age_key_file="$HOME/.config/sops/age/keys.txt"
|
||||
local keepass_entry="age/$key_name"
|
||||
local attachment_name="keys.txt"
|
||||
@@ -42,7 +43,7 @@ store-agekey-to-keepass() {
|
||||
fi
|
||||
|
||||
local public_key
|
||||
public_key=$(grep -E '^[[:space:]]*age:' ".sops.yaml" 2>/dev/null | head -1 | awk '{print $2}' | tr -d '"')
|
||||
public_key=$(grep -E '^[[:space:]]*age:' ".sops.yaml" 2>/dev/null | head -1 | awk '{print $2}' | tr -d '"' | tr -d "'")
|
||||
if [[ -z "$public_key" ]]; then
|
||||
echo "Could not determine public key from .sops.yaml"
|
||||
return 1
|
||||
|
||||
Reference in new issue
Block a user