From a3889dc8b12ede2459ef93fa1be1aeb6cd81ce6d Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 5 Jun 2018 17:26:31 +0200 Subject: [PATCH] bin/doom: don't set DOOMDIR Now that we use it for doom-private-dir --- bin/doom | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/doom b/bin/doom index 08e6c5959..301f23176 100755 --- a/bin/doom +++ b/bin/doom @@ -3,9 +3,9 @@ ":"; command -v $EMACS >/dev/null || { >&2 echo "Emacs isn't installed"; exit 1; } ":"; VERSION=$($EMACS --version | head -n1) ":"; [[ $VERSION == *\ 2[0-2].[0-1].[0-9] ]] && { echo "You're running $VERSION"; echo "That version is too old to run Doom. Check your PATH"; echo; exit 2; } -":"; DOOMDIR=$(dirname "${BASH_SOURCE:-${(%):-%x}}")/.. -":"; [[ $1 == doc || $1 == doctor ]] && { cd "$DOOMDIR"; exec $EMACS --script bin/doom-doctor; exit 0; } -":"; [[ $1 == run ]] && { cd "$DOOMDIR"; shift; exec $EMACS -q --no-splash -l bin/doom "$@"; exit 0; } +":"; DOOMBASE=$(dirname "${BASH_SOURCE:-${(%):-%x}}")/.. +":"; [[ $1 == doc || $1 == doctor ]] && { cd "$DOOMBASE"; exec $EMACS --script bin/doom-doctor; exit 0; } +":"; [[ $1 == run ]] && { cd "$DOOMBASE"; shift; exec $EMACS -q --no-splash -l bin/doom "$@"; exit 0; } ":"; exec $EMACS --script "$0" -- $@ ":"; exit 0