phg/.files
0
0
Fork 0
mirror of https://github.com/shokinn/.files.git synced 2024-10-06 07:08:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix age functions; cleanup

Browse source
This commit is contained in:
Philip Henning 2023-10-15 13:26:52 +02:00
parent aec7ca3729
commit f05cc4561e
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
dotfiles/commonfunc
View file

@ -75,7 +75,6 @@ if [[ $(command -v age) ]]; then
local tmp_path="$(mktemp -p /dev/shm)" local tmp_path="$(mktemp -p /dev/shm)"
local recipients_list=$(ageGetRecipientsList "${secret_path}") local recipients_list=$(ageGetRecipientsList "${secret_path}")
local identity="${MASTERKEY_FILE:-$([[ -f "$(realpath "secrets/hostkeys/masterkey.privkey")" ]] && echo -n "$(realpath "secrets/hostkeys/masterkey.privkey")" || echo -n "/dev/stdin")}" local identity="${MASTERKEY_FILE:-$([[ -f "$(realpath "secrets/hostkeys/masterkey.privkey")" ]] && echo -n "$(realpath "secrets/hostkeys/masterkey.privkey")" || echo -n "/dev/stdin")}"
# [[ -f "$(realpath "secrets/hostkeys/masterkey.privkey")" ]] && local identity="$(realpath "secrets/hostkeys/masterkey.privkey")" ||
if test -e "${secret_path}"; then if test -e "${secret_path}"; then
set +e +o pipefail set +e +o pipefail
@ -101,7 +100,7 @@ if [[ $(command -v age) ]]; then
if test "${mod_time_before}" != "${mod_time_after}"; then if test "${mod_time_before}" != "${mod_time_after}"; then
echo "change detected, reencrypting file" > /dev/stderr echo "change detected, reencrypting file" > /dev/stderr
age ${recipients_list[@]} --encrypt --armor --output "${secret_path}" "${tmp_path}" age $(sed -e "s/^\'//" -e "s/\'$//" <<<"${recipients_list[@]}") --encrypt --armor --output "${secret_path}" "${tmp_path}"
else else
echo "no change detected, not reencrypting file" > /dev/stderr echo "no change detected, not reencrypting file" > /dev/stderr
fi fi
@ -143,7 +142,7 @@ if [[ $(command -v age) ]]; then
} }
if test $? -eq 0 ; then if test $? -eq 0 ; then
echo -n "${content}" \ echo -n "${content}" \
| age ${recipients[@]} \ | age $(sed -e "s/^\'//" -e "s/\'$//" <<<"${recipients[@]}") \
--encrypt \ --encrypt \
--armor \ --armor \
--output "${line}" --output "${line}"