Merge pull request #1476 from chrunchyjesus/fix_doom_executable
This commit is contained in:
commit
56cd92ab3d
5 changed files with 6 additions and 6 deletions
2
bin/doom
2
bin/doom
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/sh
|
#!/usr/bin/env sh
|
||||||
":"; ( echo "$EMACS" | grep -q "term" ) && EMACS=emacs || EMACS=${EMACS:-emacs} # -*-emacs-lisp-*-
|
":"; ( echo "$EMACS" | grep -q "term" ) && EMACS=emacs || EMACS=${EMACS:-emacs} # -*-emacs-lisp-*-
|
||||||
":"; command -v $EMACS >/dev/null || { >&2 echo "Emacs isn't installed"; exit 1; }
|
":"; command -v $EMACS >/dev/null || { >&2 echo "Emacs isn't installed"; exit 1; }
|
||||||
":"; VERSION=$($EMACS --version | head -n1)
|
":"; VERSION=$($EMACS --version | head -n1)
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/sh
|
#!/usr/bin/env sh
|
||||||
":"; command -v emacs >/dev/null || { >&2 echo "Emacs isn't installed"; exit 1; } # -*-emacs-lisp-*-
|
":"; command -v emacs >/dev/null || { >&2 echo "Emacs isn't installed"; exit 1; } # -*-emacs-lisp-*-
|
||||||
":"; VERSION=$(emacs --version | head -n1)
|
":"; VERSION=$(emacs --version | head -n1)
|
||||||
":"; case $VERSION in *\ 2[0-2].[0-1].[0-9]) echo "You're running $VERSION"; echo "That version is too old to run the doctor. Check your PATH"; echo; exit 2 ;; esac
|
":"; case $VERSION in *\ 2[0-2].[0-1].[0-9]) echo "You're running $VERSION"; echo "That version is too old to run the doctor. Check your PATH"; echo; exit 2 ;; esac
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/sh
|
#!/usr/bin/env sh
|
||||||
|
|
||||||
# Open an org-capture popup frame from the shell. This opens a temporary emacs
|
# Open an org-capture popup frame from the shell. This opens a temporary emacs
|
||||||
# daemon if emacs isn't already running.
|
# daemon if emacs isn't already running.
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/sh
|
#!/usr/bin/env sh
|
||||||
":"; exec emacs --quick --script "$0" -- "$@" # -*- mode: emacs-lisp; lexical-binding: t; -*-
|
":"; exec emacs --quick --script "$0" -- "$@" # -*- mode: emacs-lisp; lexical-binding: t; -*-
|
||||||
;;; bin/org-tangle
|
;;; bin/org-tangle
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ This patch fixes this by patching Emacs.app (in /Applications or
|
||||||
1. Move Contents/MacOS/Emacs to Contents/MacOS/RunEmacs
|
1. Move Contents/MacOS/Emacs to Contents/MacOS/RunEmacs
|
||||||
2. And replace Contents/MacOS/Emacs with the following wrapper script:
|
2. And replace Contents/MacOS/Emacs with the following wrapper script:
|
||||||
|
|
||||||
#!/bin/bash
|
#!/user/bin/env bash
|
||||||
args=\"$@\"
|
args=\"$@\"
|
||||||
pwd=\"$(cd \"$(dirname \"${BASH_SOURCE[0]}\")\"; pwd -P)\"
|
pwd=\"$(cd \"$(dirname \"${BASH_SOURCE[0]}\")\"; pwd -P)\"
|
||||||
exec \"$SHELL\" -l -c \"$pwd/RunEmacs $args\"
|
exec \"$SHELL\" -l -c \"$pwd/RunEmacs $args\"
|
||||||
|
@ -79,7 +79,7 @@ depending on your shell configuration and isn't always reliable.")
|
||||||
(unless (file-exists-p newbin)
|
(unless (file-exists-p newbin)
|
||||||
(error "Failed to copy %s to %s" oldbin newbin))
|
(error "Failed to copy %s to %s" oldbin newbin))
|
||||||
(with-temp-buffer
|
(with-temp-buffer
|
||||||
(insert "#!/bin/bash\n"
|
(insert "#!/usr/bin/env bash\n"
|
||||||
"args=\"$@\"\n"
|
"args=\"$@\"\n"
|
||||||
"pwd=\"$(cd \"$(dirname \"${BASH_SOURCE[0]}\")\"; pwd -P)\"\n"
|
"pwd=\"$(cd \"$(dirname \"${BASH_SOURCE[0]}\")\"; pwd -P)\"\n"
|
||||||
"exec \"$SHELL\" -l -c \"$pwd/RunEmacs $args\"")
|
"exec \"$SHELL\" -l -c \"$pwd/RunEmacs $args\"")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue