From 45bb8be590318ef8f34df0d22aa9b54a83adc42e Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Mon, 17 Jun 2019 11:10:19 -0400 Subject: [PATCH] various fixes and improvements --- brc | 11 ++++- btrbk-run | 4 +- distro-end | 43 +++++++++++-------- filesystem/etc/ansible/ansible.cfg | 2 +- .../etc/systemd/system/btrbk.service | 2 +- mail-setup | 9 +++- pkgs | 1 + 7 files changed, 46 insertions(+), 26 deletions(-) diff --git a/brc b/brc index f0ae687..f003263 100644 --- a/brc +++ b/brc @@ -157,6 +157,7 @@ HISTIGNORE='pass *:[ ]*:lom*:gram*' export BC_LINE_LENGTH=0 +export PROFILE_TASKS_TASK_OUTPUT_LIMIT=100 # note, if I use a machine I dont want files readable by all users, set # umask 077 # If fewer than 4 digits are entered, leading zeros are assumed @@ -623,7 +624,7 @@ envload() { # load environment from a previous: export > file # mail related etail() { - sudo tail -f /var/log/exim4/mainlog + sudo tail -F /var/log/exim4/mainlog -n 50 } f() { @@ -1676,7 +1677,7 @@ splay() { # script replay scriptreplay "$1.t" "$1.s" } -smeld() { # usage host1 host2 file +smeld() { # ssh meld usage host1 host2 file meld <(ssh $1 cat $3) <(ssh $2 cat $3) } @@ -2026,6 +2027,8 @@ xl() { xscreensaver-command -activate } +xevkb() { xev -event keyboard; } + # * misc stuff # from curl cheat.sh/:bash_completion @@ -2292,6 +2295,10 @@ export GOPATH=$HOME/go path_add $GOPATH/bin path_add /usr/local/go/bin +# I have the git repo and a release. either one should work. +# I have both because I was trying to solve an issue that +# turned out to be unrelated. +# ARDUINO_PATH=/a/opt/Arduino/build/linux/work export ARDUINO_PATH=/a/opt/arduino-1.8.9 path_add --end ~/.npm-global diff --git a/btrbk-run b/btrbk-run index a5fd62a..6908018 100644 --- a/btrbk-run +++ b/btrbk-run @@ -255,10 +255,10 @@ else sshable=() sshfail=() - min_idle=$((60 * 15)) + min_idle_ms=$((1000 * 60 * 15)) for h in ${targets[@]}; do if zone=$(ssh root@$h "mkdir -p /mnt/root/btrbk && date +%z"); then - if $cron && xidle=$(ssh iank@$h DISPLAY=:0 xprintidle) && [[ $xidle && $xidle -lt $min_idle ]]; then + if $cron && DISPLAY=:0 xprintidle; then # This is a separate ssh because xprintidle can fail and thats ok. # Ignore this host. i sometimes use a non-main machine for testing or web browsing, knowing that # everything will be wiped by the next backup, but I dont want it to happen as Im using diff --git a/distro-end b/distro-end index 64441d1..0e7c4b8 100755 --- a/distro-end +++ b/distro-end @@ -609,25 +609,27 @@ fi sgo fsf-vpn-dns-cleanup -case $distro in - debian) - pi chromium ;; - trisquel|ubuntu) - wget -qO - https://downloads.iridiumbrowser.de/ubuntu/iridium-release-sign-01.pub|sudo apt-key add - - t=$(mktemp) - cat >$t <$t <