From d1f6e8fa73623feda4ef0f232fe65c59d3437378 Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Fri, 24 May 2024 18:21:04 +0200 Subject: fix(update.sh): Use more descriptive names for the toplevel update.sh scripts --- modules/system/secrets/update.sh | 37 -------------------------------- modules/system/secrets/update_secrets.sh | 37 ++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 37 deletions(-) delete mode 100755 modules/system/secrets/update.sh create mode 100755 modules/system/secrets/update_secrets.sh (limited to 'modules') diff --git a/modules/system/secrets/update.sh b/modules/system/secrets/update.sh deleted file mode 100755 index edc4ae8a..00000000 --- a/modules/system/secrets/update.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env nix -#! nix shell nixpkgs#age nixpkgs#jq nixpkgs#dash --command dash -# shellcheck shell=dash - -cleanup() { - [ "$key_file" ] && rm "$key_file" -} -trap cleanup EXIT - -update_lf_cd_paths() { - echo "Starting to update the lf/cd_paths file.." - - cd "$(git rev-parse --show-toplevel)/sys/secrets" || { - echo "A secrets dir does not exist! (This is most likely a bug)" - exit 1 - } - - key_file="$(mktemp)" - - nix eval -f ./secrets.nix --json | jq --raw-output '.["lf/cd_paths"].publicKeys | join("\n")' >"$key_file" - - # `lf-make-map` is provided by the dev shell - { - lf-make-map --quiet --depth 4 visualize ~/media ~/repos ~/school | sed 's|\(.*\)|# \1|' - lf-make-map --quiet --depth 4 generate ~/media ~/repos ~/school - } | age --recipients-file "$key_file" --encrypt --armor --output ./lf/cd_paths - - echo "Finished updating the lf/cd_paths file.." -} - -main() { - update_lf_cd_paths -} - -main - -# vim: ft=sh diff --git a/modules/system/secrets/update_secrets.sh b/modules/system/secrets/update_secrets.sh new file mode 100755 index 00000000..877d2892 --- /dev/null +++ b/modules/system/secrets/update_secrets.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env nix +#! nix shell nixpkgs#age nixpkgs#jq nixpkgs#dash --command dash +# shellcheck shell=dash + +cleanup() { + [ "$key_file" ] && rm "$key_file" +} +trap cleanup EXIT + +update_lf_cd_paths() { + echo "Starting to update the lf/cd_paths file.." + + cd "$(git rev-parse --show-toplevel)/modules/system/secrets" || { + echo "A secrets dir does not exist! (This is most likely a bug)" + exit 1 + } + + key_file="$(mktemp)" + + nix eval -f ./secrets.nix --json | jq --raw-output '.["lf/cd_paths"].publicKeys | join("\n")' >"$key_file" + + # `lf-make-map` is provided by the dev shell + { + lf-make-map --quiet --depth 4 visualize ~/media ~/repos ~/school | sed 's|\(.*\)|# \1|' + lf-make-map --quiet --depth 4 generate ~/media ~/repos ~/school + } | age --recipients-file "$key_file" --encrypt --armor --output ./lf/cd_paths + + echo "Finished updating the lf/cd_paths file.." +} + +main() { + update_lf_cd_paths +} + +main + +# vim: ft=sh -- cgit 1.4.1