Merge pull request 'revert vars: use writeShellApplication to shellcheck generators' (#3331) from hsjobeki-patch-1 into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3331
This commit is contained in:
hsjobeki
2025-04-16 07:44:53 +00:00

View File

@@ -16,7 +16,7 @@ let
; ;
promptToFile = name: '' promptToFile = name: ''
cat "$prompts"/${name} > "$out"/${name} cat "$prompts/${name}" > "$out/${name}"
''; '';
promptsToFilesScript = concatMapStrings promptToFile; promptsToFilesScript = concatMapStrings promptToFile;
@@ -25,13 +25,8 @@ let
in in
{ {
finalScript = mkOptionDefault ( finalScript = mkOptionDefault (
lib.getExe ( pkgs.writeScript "generator-${config.name}" ''
pkgs.writeShellApplication { set -eu -o pipefail
name = "generator-${config.name}";
text = ''
in="''${in:?}"
out="''${out:?}"
${if config.prompts == { } then "" else ''prompts="''${prompts:?}"''}
export PATH="${makeBinPath config.runtimeInputs}:${pkgs.coreutils}/bin" export PATH="${makeBinPath config.runtimeInputs}:${pkgs.coreutils}/bin"
@@ -58,9 +53,7 @@ in
''} ''}
${promptsToFilesScript filePromptNames} ${promptsToFilesScript filePromptNames}
${config.script} ${config.script}
''; ''
}
)
); );
files = genAttrs filePromptNames (_name: { }); files = genAttrs filePromptNames (_name: { });