fix: fix _agenix_generation being empty if readlink fails

ryantm · Sep 11, 2024 · 2e80d9d · 2e80d9d
1 parent f6291c5
commit 2e80d9d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/modules/age-home.nix b/modules/age-home.nix
@@ -11,7 +11,7 @@ with lib; let
   ageBin = lib.getExe config.age.package;
 
   newGeneration = ''
-    _agenix_generation="$(basename "$(readlink "${cfg.secretsDir}")" || echo 0)"
+    _agenix_generation="$(basename "$(readlink "${cfg.secretsDir}" || echo 0)")"
     (( ++_agenix_generation ))
     echo "[agenix] creating new generation in ${cfg.secretsMountPoint}/$_agenix_generation"
     mkdir -p "${cfg.secretsMountPoint}"
@@ -73,7 +73,7 @@ with lib; let
     cfg.identityPaths;
 
   cleanupAndLink = ''
-    _agenix_generation="$(basename "$(readlink "${cfg.secretsDir}")" || echo 0)"
+    _agenix_generation="$(basename "$(readlink "${cfg.secretsDir}" || echo 0)")"
     (( ++_agenix_generation ))
     echo "[agenix] symlinking new secrets to ${cfg.secretsDir} (generation $_agenix_generation)..."
     ln -sfT "${cfg.secretsMountPoint}/$_agenix_generation" "${cfg.secretsDir}"

diff --git a/modules/age.nix b/modules/age.nix
@@ -29,7 +29,7 @@ with lib; let
         mount -t ramfs none "${cfg.secretsMountPoint}" -o nodev,nosuid,mode=0751
     '';
   newGeneration = ''
-    _agenix_generation="$(basename "$(readlink ${cfg.secretsDir})" || echo 0)"
+    _agenix_generation="$(basename "$(readlink "${cfg.secretsDir}" || echo 0)")"
     (( ++_agenix_generation ))
     echo "[agenix] creating new generation in ${cfg.secretsMountPoint}/$_agenix_generation"
     mkdir -p "${cfg.secretsMountPoint}"
@@ -100,7 +100,7 @@ with lib; let
     cfg.identityPaths;
 
   cleanupAndLink = ''
-    _agenix_generation="$(basename "$(readlink ${cfg.secretsDir})" || echo 0)"
+    _agenix_generation="$(basename "$(readlink "${cfg.secretsDir}" || echo 0)")"
     (( ++_agenix_generation ))
     echo "[agenix] symlinking new secrets to ${cfg.secretsDir} (generation $_agenix_generation)..."
     ln -sfT "${cfg.secretsMountPoint}/$_agenix_generation" ${cfg.secretsDir}