overdue commit lots of changes

[buildscripts] / org-mode

diff --git a/org-mode b/org-mode
index 0474aa957a8ce1751dcaac6f22e42f4af7c75d95..60a3a8c6f6c1a0c82c7f4a905af71a57ff5da163 100755 (executable)
--- a/org-mode
+++ b/org-mode
@@ -1,5 +1,12 @@
-#!/bin/bash -l
-# Copyright (C) 2016 Ian Kelling
+#!/bin/bash
+# I, Ian Kelling, follow the GNU license recommendations at
+# https://www.gnu.org/licenses/license-recommendations.en.html. They
+# recommend that small programs, < 300 lines, be licensed under the
+# Apache License 2.0. This file contains or is part of one or more small
+# programs. If a small program grows beyond 300 lines, I plan to switch
+# its license to GPL.
+
+# Copyright 2024 Ian Kelling
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,11 +20,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
 # git clone git://orgmode.org/org-mode.git
 # texinfo is all that is technically needed, but having tex for math is good
 
-set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+if [[ -s ~/.bashrc ]];then . ~/.bashrc;fi
 
 logq pi git texlive install-info
 
@@ -28,8 +35,8 @@ if isdeb; then
 else
     logq pi texinfo-tex
 fi
-rm -rf !(.git)
-i checkout -f errbuff
+# rm -rf !(.git)
+# i checkout -f errbuff
 
 if [[ $1 == -u ]]; then
     git fetch
@@ -40,8 +47,14 @@ fi
 # org-learn is a dependency of org-drill
 dd of=local.mk <<'EOF'
 ORG_ADD_CONTRIB = org-drill org-learn
-EMACS = /usr/bin/emacs
+EMACS = /usr/local/bin/emacs
 prefix        = /a/c/.emacs.d
 EOF
-rm -rf /a/c/.emacs.d/emacs
+
+d=/a/c/.emacs.d/emacs
+if [[ -e $d ]]; then
+    d2=${d}-disabled
+    rm -rf $d2
+    mv $d $d2
+fi
 logq make install