Prefer --subst-var over --subst-var-by

Rename a few other template vars to remain consistent.
This commit is contained in:
Marien Zwart 2024-06-01 21:22:17 +10:00
parent 48c4531e2e
commit ce63f7f54a
No known key found for this signature in database
2 changed files with 10 additions and 10 deletions

View file

@ -325,15 +325,15 @@ let
fi
rm $out/doomdir/init.el
if [[ -z "$profileName" ]]; then
setProfile="(setq doom-profile-dir \"$out/profile\")"
maybeSetProfileDir="(setq doom-profile-dir \"$out/profile\")"
else
setProfile=""
maybeSetProfileDir=""
fi
substitute $initEl $out/doomdir/init.el \
--subst-var-by maybe-set-profile-dir "$setProfile" \
--subst-var-by profile-name "$profileName" \
--subst-var-by user-init "$doomDir/init.el" \
--subst-var-by straight-base-dir $out
--subst-var maybeSetProfileDir \
--subst-var profileName \
--subst-var-by userInit "$doomDir/init.el" \
--subst-var-by straightBaseDir $out
ln -sf $doomIntermediates/packages.el $out/doomdir/
export DOOMDIR=$out/doomdir