# works in addition to HISTCONTROL to do more flexible things
# it could also do the same things as HISTCONTROL and thus replace it,
# but meh. dunno why, but just " *" does glob expansion, so use [ ] to avoid it.
-HISTIGNORE='pass *:[ ]*:lom*:gram*'
+HISTIGNORE='pass *:[ ]*:otp *:oathtool *'
export BC_LINE_LENGTH=0
for x in /a/bin/bash_unpublished/source-!(.#*); do source $x; done
source $(dirname $(readlink -f $BASH_SOURCE))/path_add-function
source /a/bin/log-quiet/logq-function
-if [[ -e /a/bin/errhandle/err ]]; then
- source /a/bin/errhandle/err
- err-allow
-fi
-# if someone exported $SOE (stop on error), catch errors
+# if someone exported $SOE (stop on error), catch errors.
+#
+# Note, on debian this results in the following warning when in ssh,
+# hich I haven't figured out how to fix. It doesn't happen if we source
+# after the shell has started
+#
+# bash: /usr/share/bashdb/bashdb-main.inc: No such file or directory
+# bash: warning: cannot start debugger; debugging mode disabled
if [[ $SOE ]]; then
- err-catch
+ if [[ -e /a/bin/errhandle/err ]]; then
+ source /a/bin/errhandle/err
+ fi
fi
path_add /a/exe
local p
fdroidcl update
if fdroidcl search -u | grep ^org.fdroid.fdroid; then
- fdroidcl upgrade org.fdroid.fdroid
+ fdroidcl install org.fdroid.fdroid
sleep 5
fdroidcl update
fi
done
for p in ${!installed[@]}; do
if ! ${updated[$p]:-true}; then
- fdroidcl upgrade $p
+ fdroidcl install $p
sleep 5
fi
done
grep --exclude-dir='*.emacs.d' --exclude-dir='*.git' -RiIP --color=auto "$@"
fi
}
+rg() {
+ command rg -i -M 200 "$@"
+}
hstatus() {
# do git status on published repos
}
+nk() {
+ ser stop NetworkManager
+ ser stop dnsmasq
+ s resolvconf -d NetworkManager
+ ser start dnsmasq
+ s ifup br0
+}
+ngo() {
+ s ifdown br0
+ ser start NetworkManager
+ sleep 4
+ s nmtui-connect
+}
+
nopanic() {
sudo tee -a /var/log/exim4/paniclog-archive </var/log/exim4/paniclog; sudo truncate -s0 /var/log/exim4/paniclog
}
rbpipe() { rbt post -o --diff-filename=- "$@"; }
rbp() { rbt post -o "$@"; }
+rebr() {
+ s ifdown br0
+ s ifup br0
+}
+
resolvcat() {
local f
f=/etc/resolv.conf
systemctl restart $service
fi
}
-stopnm() {
- ser stop NetworkManager
- ser stop dnsmasq
- s resolvconf -d NetworkManager
- ser start dnsmasq
-}
-startnm() {
- ser start NetworkManager
- s nmtui-connect
-}
setini() { # set a value in a .ini style file
key="$1" value="$2" section="$3" file="$4"
ssh $1 /tmp/${2##*/} "${@:2}"
}
+ssh() {
+ BASH_LOGIN_SHELL=true command ssh "$@"
+}
sss() { # ssh solo
ssh -oControlMaster=no -oControlPath=/ "$@"
}
# MSG_ID is in /var/log/exim4/mainlog, looks like 1ccdnD-0001nh-EN
}
-# to test sieve, use below command. for fsf mail, see fsf-get-mail script.
+# to test sieve, use below command. for fsf mail, see offlineimap-sync script
# make modifications, then copy to live file, use -eW to actually modify mailbox
-# cp /p/c/subdir_files/sieve/personal{test,}.sieve; testsievelist -eW INBOX
#
# Another option is to use sieve-test SCRIPT MAIL_FILE. note,
# sieve-test doesnt know about envelopes, Im not sure if sieve-filter does.
# sieve with output filter. arg is mailbox, like INBOX.
# This depends on dovecot conf, notably mail_location in /etc/dovecot/conf.d/10-mail.conf
-testsievelist() {
- sieve-filter ~/sieve/maintest.sieve "$@" >/tmp/testsieve.log 2> >(tail) && sed -rn '/^Performed actions:/{n;n;p}' /tmp/testsieve.log | sort -u
+_dosieve() {
+ sieve-filter "$@" 2> >(head; tail) >/tmp/testsieve.log && sed -rn '/^Performed actions:/,/^[^ ]/{/^ /p}' /tmp/testsieve.log | sort | uniq -c
}
-
-# mail related
-# plain sieve
+# always run this first, edit the test files, then run the following
testsieve() {
- sieve-filter ~/sieve/main.sieve "$@"
+ _dosieve ~/sieve/maintest.sieve ${1:-INBOX} delete
+}
+runsieve() {
+ c ~/sieve; cp personal{test,}.sieve; cp lists{test,}.sieve
+ _dosieve ~/sieve/main.sieve -eW ${1:-INBOX} delete
}
# mail related
wtr() { curl wttr.in/boston; }
-xl() {
- if pgrep gnome-screensav &>/dev/null; then
- # this command actually starts gnome-screensaver if it isn\'t running.
- # lololol, what crap
- gnome-screensaver-command --exit &>/dev/null
- fi
- mate-screensaver-command --exit &>/dev/null
- if ! pidof xscreensaver; then
- pushd /
- xscreensaver &
- popd
- # 1 was not long enough
- sleep 3
- fi
- xscreensaver-command -activate
-}
-
xevkb() { xev -event keyboard; }
# * misc stuff
case $return in
- 0) ps_color="$(get_term_color blue)"
+ 0) ps_color="$(get_term_color purple)"
ps_char='\$'
;;
1) ps_color="$(get_term_color green)"
if [[ -e /nocow/btrfs-stale ]] && ((`command ls -AUq /nocow/btrfs-stale|wc -l`)); then
ps_char="! $ps_char"
fi
+ if [[ -e /nocow/mailtest-failure ]]; then
+ ps_char="@#$@#$ $ps_char"
+ fi
+ source /a/bin/bash_unpublished/source-state
if [[ ! $SSH_CLIENT && $MAIL_HOST != $HOSTNAME ]]; then
ps_char="@ $ps_char"
fi
# ARDUINO_PATH=/a/opt/Arduino/build/linux/work
export ARDUINO_PATH=/a/opt/arduino-1.8.9
+# They want to be added to the start, but i think
+# that should be avoided unless we really need it.
path_add --end ~/.npm-global
+path_add --end $HOME/.cargo/bin
+
# taken from default changes to bashrc and bash_profile
path_add --end $HOME/.rvm/bin
[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*