Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Support dry run in activation script

Browse source 
If the `DRY_RUN` variable is set then no actual change should be
performed. Only printing what actions would be taken.
This commit is contained in:
Robert Helgesson 2017-01-16 00:06:27 +01:00
parent a5c8362f7b
commit b1f84ada60
No known key found for this signature in database
GPG key ID: C3DB11069E65DC86
3 changed files with 29 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
modules/home-environment.nix
View file

@ -168,7 +168,15 @@ in
internal = true;
default = {};
type = types.attrs;
description = "Activation scripts for the home environment.";
description = ''
Activation scripts for the home environment.
</para><para>
Any script should respect the <varname>DRY_RUN</varname>
variable, if it is set then no actual action should be taken.
The variable <varname>DRY_RUN_CMD</varname> is set to
<code>echo</code> if dry run is enabled. Thus, many cases you
can use the idiom <code>$DRY_RUN_CMD rm -rf /</code>.
'';
};
home.activationPackage = mkOption {
@ -202,8 +210,8 @@ in
for sourcePath in "$@" ; do
relativePath="$(realpath --relative-to "$newGenFiles" "$sourcePath")"
targetPath="$HOME/$relativePath"
mkdir -vp "$(dirname "$targetPath")"
ln -vsf "$sourcePath" "$targetPath"
$DRY_RUN_CMD mkdir -vp "$(dirname "$targetPath")"
$DRY_RUN_CMD ln -vsf "$sourcePath" "$targetPath"
done
'';
@ -219,8 +227,8 @@ in
echo " exists"
else
echo " gone (deleting)"
rm -v "$targetPath"
rmdir --ignore-fail-on-non-empty -v -p "$(dirname "$targetPath")"
$DRY_RUN_CMD rm -v "$targetPath"
$DRY_RUN_CMD rmdir --ignore-fail-on-non-empty -v -p "$(dirname "$targetPath")"
fi
done
'';
@ -284,8 +292,8 @@ in
}
if [[ "$oldGenPath" != "$newGenPath" ]] ; then
ln -Tsfv "$newGenPath" "$newGenProfilePath"
ln -Tsfv "$newGenPath" "$newGenGcPath"
$DRY_RUN_CMD ln -Tsfv "$newGenPath" "$newGenProfilePath"
$DRY_RUN_CMD ln -Tsfv "$newGenPath" "$newGenGcPath"
linkNewGen
cleanOldGen
else
@ -316,6 +324,14 @@ in
sf = pkgs.writeText "activation-script" ''
#!${pkgs.stdenv.shell}
if [[ $DRY_RUN ]] ; then
echo "Performing dry run"
export DRY_RUN_CMD=echo
else
echo "Performing live run"
unset DRY_RUN_CMD
fi
${activationCmds}
'';

6
modules/programs/gnome-terminal.nix
View file

@ -183,7 +183,11 @@ in
dconfPath = "/org/gnome/terminal/legacy/";
in
''
${pkgs.gnome3.dconf}/bin/dconf load ${dconfPath} < ${sf}
if [[ $DRY_RUN ]]; then
echo ${pkgs.gnome3.dconf}/bin/dconf load ${dconfPath} "<" ${sf}
else
${pkgs.gnome3.dconf}/bin/dconf load ${dconfPath} < ${sf}
fi
'';
};
}

2
modules/systemd.nix
View file

@ -120,7 +120,7 @@ in
fi
}
systemctl --user daemon-reload
$DRY_RUN_CMD systemctl --user daemon-reload
systemdPostReload
'';
};