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 89a09babf4e1f78c6a9af33ed530985da90a0359..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
}
@@
-236,7
+236,7
@@
done
###### do conflink
# linode needs bind group before conflink
###### do conflink
# linode needs bind group before conflink
-if
$
linode; then
+if linode; then
pi-nostart bind9
fi
# this needs to be before installing pacserve so we have gpg conf.
pi-nostart bind9
fi
# this needs to be before installing pacserve so we have gpg conf.
@@
-246,6
+246,7
@@
conflink
set +x
err-allow
source /etc/profile.d/environment.sh
set +x
err-allow
source /etc/profile.d/environment.sh
+export BRC=t
# shellcheck source=./.bashrc
source ~/.bashrc
err-catch
# shellcheck source=./.bashrc
source ~/.bashrc
err-catch
@@
-335,7
+336,7
@@
case $distro in
sudo rmmod evbug ||: # might not be loaded yet
file=/etc/modprobe.d/evbug.conf
line="blacklist evbug"
sudo rmmod evbug ||: # might not be loaded yet
file=/etc/modprobe.d/evbug.conf
line="blacklist evbug"
- if
! grep -xFq "$line" $file
; then
+ if
[[ $(cat $file) != $line ]]
; then
sudo dd of=$file 2>/dev/null <<<"$line"
sudo depmod -a
sudo update-initramfs -u
sudo dd of=$file 2>/dev/null <<<"$line"
sudo depmod -a
sudo update-initramfs -u