various fixes

[buildscripts] / org-mode

diff --git a/org-mode b/org-mode
index 0474aa957a8ce1751dcaac6f22e42f4af7c75d95..c9d0b1ddb82547d84659220d3cb5495ffe82a836 100755 (executable)
--- a/org-mode
+++ b/org-mode
@@ -1,4 +1,4 @@
-#!/bin/bash -l
+#!/bin/bash
 # Copyright (C) 2016 Ian Kelling
 
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,8 +16,7 @@
 # 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 +27,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 +39,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