diff options
| author | Felix Bühler <Stunkymonkey@users.noreply.github.com> | 2023-07-22 13:02:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-22 13:02:47 +0200 |
| commit | 0a2745684e8e97340d947d56b0ba778056c10395 (patch) | |
| tree | c258179185eefafddef480949e84046d3bb50b2e /nixos/modules/services/continuous-integration | |
| parent | 4448ec5cd84f00350969934deb4d9ac9055c411c (diff) | |
| parent | e770737241360cdfd09b421eea83160dce02c212 (diff) | |
| download | nixpkgs-0a2745684e8e97340d947d56b0ba778056c10395.tar nixpkgs-0a2745684e8e97340d947d56b0ba778056c10395.tar.gz nixpkgs-0a2745684e8e97340d947d56b0ba778056c10395.tar.bz2 nixpkgs-0a2745684e8e97340d947d56b0ba778056c10395.tar.lz nixpkgs-0a2745684e8e97340d947d56b0ba778056c10395.tar.xz nixpkgs-0a2745684e8e97340d947d56b0ba778056c10395.tar.zst nixpkgs-0a2745684e8e97340d947d56b0ba778056c10395.zip | |
Merge pull request #239624 from Stunkymonkey/use-optionalString-then
treewide: use optionalString instead of 'then ""'
Diffstat (limited to 'nixos/modules/services/continuous-integration')
| -rw-r--r-- | nixos/modules/services/continuous-integration/jenkins/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index a9a587b41e8..e4d54b0cb0f 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -210,9 +210,7 @@ in { preStart = let replacePlugins = - if cfg.plugins == null - then "" - else + optionalString (cfg.plugins != null) ( let pluginCmds = lib.attrsets.mapAttrsToList (n: v: "cp ${v} ${cfg.home}/plugins/${n}.jpi") cfg.plugins; @@ -220,7 +218,7 @@ in { rm -r ${cfg.home}/plugins || true mkdir -p ${cfg.home}/plugins ${lib.strings.concatStringsSep "\n" pluginCmds} - ''; + ''); in '' rm -rf ${cfg.home}/war ${replacePlugins} |