# * settings
-if [[ $HISTFILE ]]; then
+if [[ $LESSHISTFILE == - ]]; then
+ HISTFILE=
+ c() { cd "$@"; }
+elif [[ $HISTFILE ]]; then
HISTFILE=$HOME/.bh
fi
path-add --ifexists --end /a/work/libremanage
path-add --ifexists --end /a/opt/adt-bundle*/tools /a/opt/adt-bundle*/platform-tools
path-add --ifexists --end /a/opt/scancode-toolkit-3.10.
+path-add --ifexists --end /p/bin
case $HOSTNAME in
sy|bo)
s rsync -e "ssh -F /root/.ssh/confighome" "$@"
}
+zcheck() {
+ ssh bow DISPLAY=:0 scrot /tmp/oegu.jpg
+ scp bow:/tmp/oegu.jpg /t
+ ssh bow rm /tmp/oegu.jpg
+ feh /t/oegu.jpg
+}
slemacs() {
local arg rtime v
fi
ngreset
}
-ngset() {
- if shopt nullglob >/dev/null; then
- ngreset=false
- else
- shopt -s nullglob
- ngreset=true
- fi
-}
-ngreset() {
- if $ngreset; then
- shopt -u nullglob
- fi
-}
checkre() {
s checkrestart -b /a/bin/ds/checkrestart-blacklist -pv
}
aw() {
pushd /a/work/ans >/dev/null
- time ansible-playbook -v -i inventory adhoc.yml "$@"
+ time ansible-playbook -i inventory adhoc.yml "$@"
popd >/dev/null
}
ad() {
install-my-scripts
# todo: consider changing this to srun and having the args come
# from a file like /etc/default/btrbk, like is done in exim
- s jrun btrbk-run "$@"
+ s jdo btrbk-run "$@"
if $active; then
if (( ret )); then
echo bbk: WARNING: btrbk.timer not restarted due to failure
ngreset
}
-# duplicated somewhat below.
-jrun() { # journal run. run args, log to journal, tail and grep the journal.
- # Note, an alternative without systemd would be something like ts.
- # Note, I tried using systemd-cat, but this seems obviously better,
- # and that seemed to have a problem exiting during a systemctl daemon-reload
- local cmd_name jr_pid s
+scr() {
+ screen -RD "$@"
+}
+
+
+# version of jdo for my non-root user
+jdo() {
+ # comparison of alternative logging methods:
+ #
+ # systemd-run command (what this function does)
+ #
+ # If there is a user prompt, the program will detect that it is not
+ # connected to a terminal and act in a non-interactive way, skipping
+ # the prompt. This has the benefit that you know exactly how the
+ # program will act if you want to move it into a service that runs
+ # automatically.
+ #
+ # If run with sudo and command is a shell script which does a sleep,
+ # it can (sometimes?) output some extra whitespace in front of
+ # messages, more for each subsequent message. This can be avoided by
+ # becoming root first.
+ #
+ # It logs the command's pid and exit code, which is nice.
+ #
+ #
+ ### command |& ts | tee file.log
+ #
+ # If there is a user prompt, like "read -p prompt var", it will hang
+ # without outputting the prompt.
+ #
+ # I've had a few times where ts had an error and I wasn't totally sure
+ # if it was really the command or ts having the problem.
+ #
+ # Sometimes some output will get hidden until you hit enter.
+ #
+ #
+ ### command |& pee cat logger
+ #
+ # This seems to work. I need to test more.
+ #
+ #
+ ### command |& logger -s
+ #
+ # User prompts get confusingly prefixed to earlier output, and all log
+ # entries get prefixed with annoying priority level.
+ #
+ #
+ ### systemd-cat
+ #
+ # Had a few problems. One major one is that it exited in the middle of
+ # a command on systemctl daemon-reload
+ #
+ # Related commands which can log a whole session: script, sudo, screen
+ local cmd cmd_name jr_pid ret
ret=0
- cmd_name=${1##*/}
- cmd=$1
+ cmd="$1"
+ shift
+ cmd_name=${cmd##*/}
if [[ $cmd != /* ]]; then
- cmd=$(which $1)
+ cmd=$(type -P "$cmd")
fi
+ # -q = quiet
journalctl -qn2 -f -u "$cmd_name" &
- # Guess of time needed to avoid missing initial lines.
+ # Trial and error of time needed to avoid missing initial lines.
# .5 was not reliable. 1 was not reliable. 2 was not reliable
sleep 4
- # We kill this in prompt-command for the case that we ctrl-c the
- # systemd-cat. i dont know any way to trap ctrl-c and still run the
- # normal action for it. There might be a way, unsure.
jr_pid=$!
# note, we could have a version that does system --user, but if for example
# it does sudo ssh, that will leave a process around that we can't kill
# and it will leave the unit hanging around in a failed state needing manual
# killing of the process.
- m s systemd-run --uid $(id -u) --gid $(id -g) \
+ s systemd-run --uid $(id -u) --gid $(id -g) \
-E SSH_AUTH_SOCK=/run/openssh_agent \
- --unit "$cmd_name" --wait --collect "$cmd" "${@:2}" || ret=$?
- # This justs lets the journal output its last line
+ --unit "$cmd_name" --wait --collect "$cmd" "$@" || ret=$?
+ # The sleep lets the journal output its last line
# before the prompt comes up.
sleep .5
kill $jr_pid &>/dev/null ||:
unset jr_pid
fg &>/dev/null ||:
+ # this avoids any err-catch
+ (( $ret == 0 )) || return $ret
}
+
# service run, and watch the output
srun() {
local unit
s ssh-add /root/.ssh/home
fi
install-my-scripts
- s jrun switch-mail-host "$@"
+ s jdo switch-mail-host "$@"
return $ret
}
sh2() { # switch host2
s ssh-add /root/.ssh/home
fi
install-my-scripts
- s jrun switch-host2 "$@"
+ s jdo switch-host2 "$@"
return $ret
}
# work log
wlog() {
- local day now i
- for (( i=0; i<60; i++ )); do
+ local day now i days_back
+ days_back=${1:-16}
+ for (( i=0; i<days_back; i++ )); do
day=$( date +%F -d @$((EPOCHSECONDS - 86400*i )) )
date "+%a %b %d" -d @$((EPOCHSECONDS - 86400*i )) | tr '\n' ' '
/a/opt/timetrap/bin/t d -ftotal -s $day -e $day all -m '^w|lunch$'
mnsnonet() {
ns=$1
+ lomh
if ! s ip netns list | grep -Fx nonet &>/dev/null; then
s ip netns add nonet
fi
done
}
-# these might need a mu index or something added.
-mbenable() {
- local mb=$1
- dst=/m/4e/$mb
- src=/m/md/$mb
- [[ -e $src ]] || { echo "src:$src does not exist"; return 1; }
- m mv -T $src $dst
- m ln -s -T $dst $src
-}
-mb2enable() {
- local mb
- for mb; do
- dst=/m/4e2/$mb
- link=/m/md/$mb
- src=/m/md/$mb
- if [[ ! -e $src || -L $src ]]; then
- src=/m/4e/$mb
+# maildir enable
+mdenable() {
+ local md dst ln_path src two
+
+ two=false
+ case $1 in
+ -2) two=true shift ;;
+ esac
+
+ for md; do
+ src=
+ if $two; then
+ dst=/m/4e2/$md
+ else
+ dst=/m/4e/$md
+ fi
+
+ ln_path=/m/md/$md
+ for d in /m/md/$md /m/4e2/$md; do
+ if [[ -d $d && ! -L $d ]]; then
+ src=$d
+ break
+ fi
+ done
+ if [[ ! $src ]]; then
+ echo "error: could not find $md" >&2
+ return 1
fi
- [[ -e $src ]] || { echo "src:$src does not exist"; return 1; }
m mv -T $src $dst
- m ln -sf -T $dst $link
+ m ln -sf -T $dst $ln_path
done
}
-mbdisable() {
- local mb=$1
- dst=/m/md/$mb
- src=/m/4e/$mb
- set -x
- [[ -e $src ]] || { set +x; return 1; }
- if [[ -L $dst ]]; then rm $dst; fi
- mv -T $src $dst
- set +x
+md2enable() {
+ mdenable -2 "$@"
}
-mb2disable() {
- local mb=$1
- dst=/m/md/$mb
- src=/m/4e2/$mb
- set -x
- [[ -e $src ]] || { set +x; return 1; }
- if [[ -L $dst ]]; then rm $dst; fi
- mv -T $src $dst
- set +x
+mddisable() {
+ local md=$1
+ dst=/m/md/$md
+
+ ### begin copied from mdenable, but different d ###
+ for d in /m/4e/$md /m/4e2/$md; do
+ if [[ -d $d && ! -L $d ]]; then
+ src=$d
+ break
+ fi
+ done
+ if [[ ! $src ]]; then
+ echo "error: could not find $md" >&2
+ return 1
+ fi
+ ### end copy from mdenable ###
+
+ if [[ -L $dst ]]; then m rm $dst; fi
+ m mv -T $src $dst
}
arg+=(")")
dir=${1:-.}
# debug:
- #find $dir "${arg[@]}" -size +1M
- find $dir "${arg[@]}" -size +1M -exec mpv --profile=d '{}' +
+ #find $dir "${arg[@]}" -size +200k
+ find $dir "${arg[@]}" -size +200k -exec mpv --profile=d '{}' +
}
mpvs() {
mpv --profile=s "$@";
ssh root@iankelling.org "cd $d; find . -mtime -60 -type f -exec grep '\<iank.*' {} +" | sed -r 's,^..([^/]*)/(.{11})(.{5})(.{8}).,\2\4 \1,' | sort
}
+# usage: debvm DEBIAN_VERSION RAM_MB
+debvm() {
+ local ver ram fname src
+ ver=$1
+ ram=${2:-2024}
+ # * is because it might have -backports in the name
+ fname=debian-$ver-*nocloud-$(dpkg --print-architecture).qcow2
+ src=/a/opt/roms/$fname
+ if [[ ! -f $src ]]; then
+ echo debvm: not found $src, download from eg: https://cloud.debian.org/images/cloud/buster/latest/
+ return 1
+ fi
+ cp -a $src /t
+ # note, in fai-revm we do this: not sure why, maybe because of br device
+ # --graphics spice,listen=0.0.0.0
+ m s virt-install --osinfo debian11 --rng /dev/urandom -n deb${ver}tmp --import -r $ram --vcpus 2 --disk /t/$fname --graphics spice
+ # note: to ssh into this machine will require host key generation: ssh-keygen -A
+
+ # random: for cvs2git on gnu www, use debian 10. I could use trisquel,
+ # but happen to want to try out the debian cloud images. the upstream
+ # requires python2 and hasn't really changed since the version in d10.
+ #
+ # apt install cvs2git cvs
+ # # 7G was not enough
+ # mount -o mode=1777,nosuid,nodev,size=34G -t tmpfs tmpfs /tmp
+ # cvs2git --encoding utf_8 --fallback-encoding ascii --dumpfile=dump www-rsync/www |& tee /tmp/l
+ ## www-rsync is an rsynced copy of the cvsfrom savannah
+}
+
mygajim() {
- local time time_sec time_pretty
+ local time time_sec time_pretty days
+ days=${1:-16}
sqlite3 -separator ' ' /p/c/subdir_files/.local/share/gajim/logs.db "select time, message from logs where contact_name = 'iank' and jid_id = 17;" | while read -r time l; do
case $time in
16*) : ;;
echo $time_pretty "$l"
time_sec=${time%%.*}
# only look at the last 18 days. generally just use this for timesheet.
- if (( time_sec < EPOCHSECONDS - 60 * 60 * 24 * 18 )); then break; fi
+ if (( time_sec < EPOCHSECONDS - 60 * 60 * 24 * days )); then break; fi
done
}
sqlite3 -separator ' ' /p/c/subdir_files/.local/share/gajim/logs.db "select time, message from logs" | less
}
+
net-dev-info() {
e "lspci -nnk|gr -iA2 net"
lspci -nnk|gr -iA2 net
}
+r2e() { command r2e -d /p/c/rss2email.json -c /p/c/rss2email.cfg "$@"; }
# only run on MAIL_HOST. simpler to keep this on one system.
r2eadd() { # usage: name url
# initial setup of rss2email:
# get up to date and dont send old entries now:
r2e run --no-send $1
}
-r2e() { command r2e -d /p/c/rss2email.json -c /p/c/rss2email.cfg "$@"; }
rspicy() { # usage: HOST DOMAIN
# connect to spice vm remote host. use vspicy for local host
fi
}
-# alert when a page goes live. not urgent.
+# alert when a page goes live.
alert200() {
+ local quiet url tmpdir
+ quiet=false
+ case $1 in
+ # dont send a diff of the html. some html is not very readable
+ -q) quiet=true
+ shift
+ ;;
+ esac
url="$1"
tmpdir="$(mktemp -d)"
cd $tmpdir
while true; do
- if torsocks wget -q "$url"; then
- alertme $tmpdir
+ if wget -q "$url"; then
+ if $quiet; then
+ echo | daylert 200
+ else
+ alertme $tmpdir
+ fi
fi
- sleep $(( 600 + RANDOM % 300 ))
+ sleep $(( 120 + RANDOM % 300 ))
done
}
# exim -t 'test@zroe.org, t2@zroe.org' <<'EOF'
#
# -t = get recipient from header
- exim -d -t <<'EOF'
-From: root@$(hostname-f)
-To: root@$(hostname-f)
+ exim -d -t <<EOF
+From: root@$(hostname -f)
+To: root@$(hostname -f)
Subject: test2
This is a test message.
EOF
}
+# test bounce exim
+testbexim() {
+ to=$1
+ exim -d -f '<>' $to <<EOF
+From: Mail Delivery System <Mailer-Daemon@gnu.org>
+To: $to
+Subject: Mail delivery failed: returning message to sender
+
+This message was created automatically by mail delivery software.
+EOF
+
+}
+
+
# toggle keyboard
tk() {
# based on
m sudo nsenter -t $pid -n -m sudo -u $USER -i bash
}
+sdnbashroot() { # systemd namespace bash
+ local unit pid
+ if (( $# != 1 )); then
+ echo $0: error wrong number of args >&2
+ return 1
+ fi
+ unit=$1
+ pid=$(servicepid $unit)
+ m sudo nsenter -t $pid -n -m bash
+}
+
+
sdncmd() { # systemd namespace cmd
local unit pid
if (( $# <= 2 )); then
}
+# very useful, copy directory structure 3 deep. add remove /*/ to change level
+# rsync -aivh --exclude '/*/*/*/' -f"+ */" -f"- *" SRC DEST
+
+
# * stuff that makes sense to be at the end
if [[ "$SUDOD" ]]; then
# allow failure, for example if we are sudoing into a user with diffferent/lesser permissions.
iankelling.org / git / distro-setup / blobdiff