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

Avoid undefined variables in activation script

Browse source
This commit is contained in:
Robert Helgesson 2017-03-29 00:10:30 +02:00
parent fea693ba16
commit 4f1eec8180
No known key found for this signature in database
GPG key ID: C3DB11069E65DC86
3 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/activation-init.sh
View file

@ -47,10 +47,15 @@ else
fi fi
$VERBOSE_ECHO "Activation variables:" $VERBOSE_ECHO "Activation variables:"
$VERBOSE_ECHO " oldGenNum=$oldGenNum" if [[ -v oldGenNum ]] ; then
$VERBOSE_ECHO " newGenNum=$newGenNum" $VERBOSE_ECHO " oldGenNum=$oldGenNum"
$VERBOSE_ECHO " oldGenPath=$oldGenPath" $VERBOSE_ECHO " oldGenPath=$oldGenPath"
else
$VERBOSE_ECHO " oldGenNum undefined (first run?)"
$VERBOSE_ECHO " oldGenPath undefined (first run?)"
fi
$VERBOSE_ECHO " newGenPath=$newGenPath" $VERBOSE_ECHO " newGenPath=$newGenPath"
$VERBOSE_ECHO " newGenNum=$newGenNum"
$VERBOSE_ECHO " newGenProfilePath=$newGenProfilePath" $VERBOSE_ECHO " newGenProfilePath=$newGenProfilePath"
$VERBOSE_ECHO " newGenGcPath=$newGenGcPath" $VERBOSE_ECHO " newGenGcPath=$newGenGcPath"
$VERBOSE_ECHO " genProfilePath=$genProfilePath" $VERBOSE_ECHO " genProfilePath=$genProfilePath"

4
modules/home-environment.nix
View file

@ -281,7 +281,7 @@ in
} }
function cleanOldGen() { function cleanOldGen() {
if [[ -z "$oldGenPath" ]] ; then if [[ ! -v oldGenPath ]] ; then
return return
fi fi
@ -294,7 +294,7 @@ in
| xargs -0 bash ${cleanup} "$newGenFiles" "$oldGenFiles" | xargs -0 bash ${cleanup} "$newGenFiles" "$oldGenFiles"
} }
if [[ "$oldGenPath" != "$newGenPath" ]] ; then if [[ ! -v oldGenPath || "$oldGenPath" != "$newGenPath" ]] ; then
$DRY_RUN_CMD ln -Tsf $VERBOSE_ARG "$newGenPath" "$newGenProfilePath" $DRY_RUN_CMD ln -Tsf $VERBOSE_ARG "$newGenPath" "$newGenProfilePath"
$DRY_RUN_CMD ln -Tsf $VERBOSE_ARG "$newGenProfilePath" "$genProfilePath" $DRY_RUN_CMD ln -Tsf $VERBOSE_ARG "$newGenProfilePath" "$genProfilePath"
$DRY_RUN_CMD ln -Tsf $VERBOSE_ARG "$newGenPath" "$newGenGcPath" $DRY_RUN_CMD ln -Tsf $VERBOSE_ARG "$newGenPath" "$newGenGcPath"

10
modules/systemd.nix
View file

@ -74,17 +74,21 @@ in
local workDir local workDir
workDir="$(mktemp -d)" workDir="$(mktemp -d)"
local oldUserServicePath="$oldGenPath/home-files/.config/systemd/user" if [[ -v oldGenPath ]] ; then
local oldUserServicePath="$oldGenPath/home-files/.config/systemd/user"
fi
local newUserServicePath="$newGenPath/home-files/.config/systemd/user" local newUserServicePath="$newGenPath/home-files/.config/systemd/user"
local oldServiceFiles="$workDir/old-files" local oldServiceFiles="$workDir/old-files"
local newServiceFiles="$workDir/new-files" local newServiceFiles="$workDir/new-files"
local servicesDiffFile="$workDir/diff-files" local servicesDiffFile="$workDir/diff-files"
if [[ ! -d "$oldUserServicePath" && ! -d "$newUserServicePath" ]]; then if [[ ! (-v oldUserServicePath && -d "$oldUserServicePath") \
&& ! -d "$newUserServicePath" ]]; then
return return
fi fi
if [[ ! -d "$oldUserServicePath" ]]; then if [[ ! (-v oldUserServicePath && -d "$oldUserServicePath") ]]; then
touch "$oldServiceFiles" touch "$oldServiceFiles"
else else
find "$oldUserServicePath" \ find "$oldUserServicePath" \