various fixes

[buildscripts] / emacs

diff --git a/emacs b/emacs
index b2c97406a9c12f44c032806cbf2a5116fa70555a..6acef0bc269d6deac5b672767e6d29a5e92d7596 100755 (executable)
--- a/emacs
+++ b/emacs
@@ -1,4 +1,4 @@
-#!/bin/bash -l
+#!/bin/bash
 # Copyright (C) 2016 Ian Kelling
 
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,8 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+if [[ -s ~/.bashrc ]];then . ~/.bashrc;fi
 
 #set -x
 # arg = git commit to check out
@@ -146,7 +145,7 @@ if $recompile || [[ $rev != "$head" ]]; then
   logq sudo make install
 
   # make emacs always work for root
-  s /a/exe/lnf /usr/local/bin/emacs /usr/bin
+  sudo /a/exe/lnf /usr/local/bin/emacs /usr/bin
 
   echo $head >~/.local/emacs-build-git-revision
 fi
@@ -161,7 +160,7 @@ rev=$(cat ~/.local/mu-build-git-revision 2>/dev/null) ||:
 head=$(git rev-parse HEAD)
 if $recompile || [[ $rev != "$head" ]]; then
 
-  if [[ $(distro-name) == trisquel ]]; then
+  if [[ $(debian-codename) == flidas ]]; then
     # use the flidas branch, stuck behind because
     # needs newer crypt libraries that are too troublesome.
     cd /a/opt/muflidas