iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mostly fixes for new error handling
[distro-setup]
/
distro-begin
diff --git
a/distro-begin
b/distro-begin
index 0377b1c1526ffe9409d5b4b57c98c615cf96337a..75b9b05942ce0ae042d0cd3b188bdfcb2f1a0317 100755
(executable)
--- a/
distro-begin
+++ b/
distro-begin
@@
-1,4
+1,4
@@
-#!/bin/bash
-l
+#!/bin/bash
# Copyright (C) 2016 Ian Kelling
#
# Licensed under the Apache License, Version 2.0 (the "License");
# Copyright (C) 2016 Ian Kelling
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@
-44,9
+44,9
@@
### make ssh interactive shell run better. for when running line interactively line by line
### make ssh interactive shell run better. for when running line interactively line by line
-sudo bash -c 'source /a/c/.bashrc && source /a/exe/ssh-emacs-setup'
-
+sudo bash -c '/a/exe/ssh-emacs-setup'
+if [[ -s ~/.bashrc ]];then . ~/.bashrc;fi
##### setup error handling
interactive=true # set this to false to force set -x
[[ $- == *i* ]] || interactive=false
##### setup error handling
interactive=true # set this to false to force set -x
[[ $- == *i* ]] || interactive=false
@@
-55,7
+55,7
@@
if ! $interactive; then
fi
source /a/bin/errhandle/err
fi
source /a/bin/errhandle/err
-
_errcatch_
cleanup() {
+
errcatch-
cleanup() {
echo 1 >~/.local/distro-begin
}
echo 1 >~/.local/distro-begin
}