From 34c844ab333471fcf73955e835bda9342cd276f7 Mon Sep 17 00:00:00 2001 From: Matthew Trzcinski Date: Sat, 23 Mar 2024 08:54:51 +0100 Subject: [PATCH] Revert "lisp/ob-shell.el: Initialize explicit-shell-file-name" This reverts commit 37cd00bb1207bfe5f50493ee48390a516b9b07b5. Commit 37cd00bb accidentally added check.sh, nohup.out, and setup.sh. --- check.sh | 6 ------ lisp/ob-shell.el | 3 +-- nohup.out | 21 --------------------- setup.sh | 16 ---------------- 4 files changed, 1 insertion(+), 45 deletions(-) delete mode 100755 check.sh delete mode 100644 nohup.out delete mode 100755 setup.sh diff --git a/check.sh b/check.sh deleted file mode 100755 index a1083fbe1..000000000 --- a/check.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -Eeuo pipefail - -make autoloads -emacs -q --eval="(add-to-list 'load-path \"/home/ahab/Projects/org-mode/lisp\")" diff --git a/lisp/ob-shell.el b/lisp/ob-shell.el index 35d9e9376..551c3785d 100644 --- a/lisp/ob-shell.el +++ b/lisp/ob-shell.el @@ -81,8 +81,7 @@ is modified outside the Customize interface." (lambda (body params) (:documentation (format "Execute a block of %s commands with Babel." name)) - (let ((explicit-shell-file-name name) - (shell-file-name name)) + (let ((shell-file-name name)) (org-babel-execute:shell body params)))) (put fname 'definition-name 'org-babel-shell-initialize)) (defalias (intern (concat "org-babel-variable-assignments:" name)) diff --git a/nohup.out b/nohup.out deleted file mode 100644 index b110156b6..000000000 --- a/nohup.out +++ /dev/null @@ -1,21 +0,0 @@ -/home/ahab/.guix-profile/bin/emacsclient: can't find socket; have you started the server? -/home/ahab/.guix-profile/bin/emacsclient: To start the server in Emacs, type "M-x server-start". -/home/ahab/.guix-profile/bin/emacsclient: No socket or alternate editor. Please use: - - --socket-name - --server-file (or environment variable EMACS_SERVER_FILE) - --alternate-editor (or environment variable ALTERNATE_EDITOR) -/home/ahab/.guix-profile/bin/emacsclient: can't find socket; have you started the server? -/home/ahab/.guix-profile/bin/emacsclient: To start the server in Emacs, type "M-x server-start". -/home/ahab/.guix-profile/bin/emacsclient: No socket or alternate editor. Please use: - - --socket-name - --server-file (or environment variable EMACS_SERVER_FILE) - --alternate-editor (or environment variable ALTERNATE_EDITOR) -/home/ahab/.guix-profile/bin/emacsclient: can't find socket; have you started the server? -/home/ahab/.guix-profile/bin/emacsclient: To start the server in Emacs, type "M-x server-start". -/home/ahab/.guix-profile/bin/emacsclient: No socket or alternate editor. Please use: - - --socket-name - --server-file (or environment variable EMACS_SERVER_FILE) - --alternate-editor (or environment variable ALTERNATE_EDITOR) diff --git a/setup.sh b/setup.sh deleted file mode 100755 index c5de9c8a5..000000000 --- a/setup.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -set -Eeuo pipefail - -echo "[DEV] Setting up ssh..." -eval "$(ssh-agent)" -ssh-add /home/ahab/.ssh/id_org -echo "[DEV] SSH setup complete" - -echo "[DEV] Rebuilding..." -make -echo "[DEV] Rebuilt" - -echo "[DEV] Restarting emacsd..." -herd restart emacsd -echo "[DEV] emacsd restarted"