danvics/selfhostblocks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Reorder definitions for readability

Browse source
This commit is contained in:
Dmitry 2026-06-04 11:10:37 +01:00
parent d51aace91e
commit d1a24c3ff8
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/default.nix
View file

@ -80,13 +80,6 @@ let
generatedReplacements = map genReplacement replacements; generatedReplacements = map genReplacement replacements;
replaceCommands = concatMapStringsSep "\n" (pattern: ''
${replaceScript} \
--file ${escapeShellArg resultPath} \
--marker ${escapeShellArg pattern.name} \
--replacement "${pattern.value}"
'') generatedReplacements;
replaceScript = pkgs.writers.writePython3 "replace-secret" { } '' replaceScript = pkgs.writers.writePython3 "replace-secret" { } ''
import argparse import argparse
import pathlib import pathlib
@ -105,6 +98,13 @@ let
args.file.write_text(content.replace(args.marker, args.replacement)) args.file.write_text(content.replace(args.marker, args.replacement))
''; '';
replaceCommands = concatMapStringsSep "\n" (pattern: ''
${replaceScript} \
--file ${escapeShellArg resultPath} \
--marker ${escapeShellArg pattern.name} \
--replacement "${pattern.value}"
'') generatedReplacements;
replaceCmd = replaceCmd =
if replacements == [ ] then if replacements == [ ] then
"cat ${escapeShellArg templatePath} > ${escapeShellArg resultPath}" "cat ${escapeShellArg templatePath} > ${escapeShellArg resultPath}"