emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dev: handle blank shell.nix inputs properly

Browse source 
If doomdir, emacsdir, and/or doomlocaldir were blank, / would be treated
as their value, which will fail in some spectacular (and some quiet)
ways.
This commit is contained in:
Henrik Lissner 2022-09-10 14:25:22 +02:00
parent b5b0d5de1c
commit c59fe8596f
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
shell.nix
View file

@ -75,9 +75,15 @@ in pkgs.stdenv.mkDerivation {
shellHook = '' shellHook = ''
export EMACS="${emacsPkg}/bin/emacs" export EMACS="${emacsPkg}/bin/emacs"
export EMACSVERSION="$($EMACS --no-site-file --batch --eval '(princ emacs-version)')" export EMACSVERSION="$($EMACS --no-site-file --batch --eval '(princ emacs-version)')"
export EMACSDIR="$(readlink -f "${emacsdir}")/" if [[ -n "${emacsdir}" ]]; then
export DOOMDIR="$(readlink -f "${doomdir}")/" export EMACSDIR="$(readlink -f "${emacsdir}")/"
export DOOMLOCALDIR="$(readlink -f "${doomlocaldir}").$EMACSVERSION/" fi
if [[ -n "${doomdir}" ]]; then
export DOOMDIR="$(readlink -f "${doomdir}")/"
fi
if [[ -n "${doomlocaldir}" ]]; then
export DOOMLOCALDIR="$(readlink -f "${doomlocaldir}").$EMACSVERSION/"
fi
export DOOMNOCOMPILE=1 export DOOMNOCOMPILE=1
export PATH="$EMACSDIR/bin:$PATH" export PATH="$EMACSDIR/bin:$PATH"
@ -91,7 +97,7 @@ in pkgs.stdenv.mkDerivation {
mkdir -p "$DOOMLOCALDIR/straight" mkdir -p "$DOOMLOCALDIR/straight"
pushd "$DOOMLOCALDIR/straight" >/dev/null pushd "$DOOMLOCALDIR/straight" >/dev/null
if [[ -d "$EMACSDIR/.local/straight/repos" && ! -d ./repos ]]; then if [[ -d "$EMACSDIR/.local/straight/repos" && ! -d ./repos ]]; then
echo "Copying '$EMACSDIR/.local/straight/repos' to './$(basename $DOOMLOCALDIR)straight/repos' to save time" echo "Copying '$EMACSDIR/.local/straight/repos' to './$(basename $DOOMLOCALDIR)/straight/repos' to save time"
cp -r "$EMACSDIR/.local/straight/repos" ./repos cp -r "$EMACSDIR/.local/straight/repos" ./repos
fi fi
popd >/dev/null popd >/dev/null