aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLassulus <github@lassul.us>2021-03-23 22:47:37 +0100
committerGitHub <noreply@github.com>2021-03-23 22:47:37 +0100
commitcccebf3ff7a53336b3f106cb96dddd5892d427ed (patch)
tree459a07217d255b26763a3d9943903f99ae93445d
parentc2fa48550f2bb46009b9cecdb9ac838dc402ce19 (diff)
parent2ea0cdb99d3531849e8afdf0c668b55f1b4cc568 (diff)
Merge pull request #30 from krebs/fixupsHEADv1.25.0master
(hopefully) fix pass with subfolders, make README more clear for extraOptions
-rw-r--r--README.md2
-rw-r--r--pkgs/populate/default.nix10
2 files changed, 8 insertions, 4 deletions
diff --git a/README.md b/README.md
index 67c9133..6648fa0 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,7 @@ pkgs.krops.writeDeploy "deploy" {
source = /* ... */;
target = lib.mkTarget "user@host/path" // {
extraOptions = [
- "-oLogLevel=DEBUG"
+ "-o" "LogLevel=DEBUG"
];
sudo = true;
};
diff --git a/pkgs/populate/default.nix b/pkgs/populate/default.nix
index 476e653..517b12e 100644
--- a/pkgs/populate/default.nix
+++ b/pkgs/populate/default.nix
@@ -119,21 +119,25 @@ let
rm -fR "$tmp_dir"
}
- ${findutils}/bin/find ${quote passPrefix} -type f -follow |
+ ${findutils}/bin/find ${quote passPrefix} -type f -follow ! -name .gpg-id |
while read -r gpg_path; do
rel_name=''${gpg_path#${quote passPrefix}}
rel_name=''${rel_name%.gpg}
pass_date=$(
- ${git}/bin/git -C ${quote source.dir} log -1 --format=%aI "$gpg_path"
+ if test -e ${quote source.dir}/.git; then
+ ${git}/bin/git -C ${quote source.dir} log -1 --format=%aI "$gpg_path"
+ fi
)
pass_name=${quote source.name}/$rel_name
tmp_path=$tmp_dir/$rel_name
${coreutils}/bin/mkdir -p "$(${coreutils}/bin/dirname "$tmp_path")"
PASSWORD_STORE_DIR=${quote source.dir} ${pass}/bin/pass show "$pass_name" > "$tmp_path"
- ${coreutils}/bin/touch -d "$pass_date" "$tmp_path"
+ if [ -n "$pass_date" ]; then
+ ${coreutils}/bin/touch -d "$pass_date" "$tmp_path"
+ fi
done
if test -n "''${local_pass_info-}"; then