From 38241f63630adcf24fa81b5cec8c470182a271d4 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Tue, 14 Dec 2021 20:06:18 +0100 Subject: [PATCH] activation: add VERBOSE env var in option description --- modules/build/activation.nix | 47 ++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/modules/build/activation.nix b/modules/build/activation.nix index 0fa49d4..3bb7fd8 100644 --- a/modules/build/activation.nix +++ b/modules/build/activation.nix @@ -46,6 +46,29 @@ let ${mkActivationCmds cfg.activation} ${mkActivationCmds cfg.activationAfter} ''; + + activationOptionDescriptionSuffix = '' + + + Any script should respect the DRY_RUN + variable, if it is set then no actual action should be taken. + The variable DRY_RUN_CMD is set to + echo if dry run is enabled. Thus, many cases you + can use the idiom $DRY_RUN_CMD rm -rf /. + + + + Any script block should also respect the + VERBOSE variable, and if set print + information on standard out that may be useful for debugging + any issue that may arise. The variable + VERBOSE_ARG is set to + if verbose output is enabled. + The variable VERBOSE_ECHO is set to + echo if verbose output is enabled, otherwise + falling back to true. So it can be used like + $VERBOSE_ECHO "any message". + ''; in { @@ -60,13 +83,7 @@ in type = types.attrs; description = '' Activation scripts for the nix-on-droid environment. - - Any script should respect the DRY_RUN - variable, if it is set then no actual action should be taken. - The variable DRY_RUN_CMD is set to - echo if dry run is enabled. Thus, many cases you - can use the idiom $DRY_RUN_CMD rm -rf /. - ''; + '' + activationOptionDescriptionSuffix; }; activationBefore = mkOption { @@ -75,13 +92,7 @@ in description = '' Activation scripts for the nix-on-droid environment that need to be run first. - - Any script should respect the DRY_RUN - variable, if it is set then no actual action should be taken. - The variable DRY_RUN_CMD is set to - echo if dry run is enabled. Thus, many cases you - can use the idiom $DRY_RUN_CMD rm -rf /. - ''; + '' + activationOptionDescriptionSuffix; }; activationAfter = mkOption { @@ -90,13 +101,7 @@ in description = '' Activation scripts for the nix-on-droid environment that need to be run last. - - Any script should respect the DRY_RUN - variable, if it is set then no actual action should be taken. - The variable DRY_RUN_CMD is set to - echo if dry run is enabled. Thus, many cases you - can use the idiom $DRY_RUN_CMD rm -rf /. - ''; + '' + activationOptionDescriptionSuffix; }; activationPackage = mkOption {