(210, 70, 80)
(255, 75, 32767)
EOF
- find /sys/ | grep 'temp[1-8]_input' | xargs -i echo hwmon {} >> /etc/thinkfan.conf
- find /sys/module/w83795/drivers/*/*/pwm1 | sort | head -1 | xargs -i echo pwm_fan {} >> /etc/thinkfan.conf
+ find /sys/ | grep 'temp[1-8]_input' | xargs -I{} echo hwmon {} >> /etc/thinkfan.conf
+ find /sys/module/w83795/drivers/*/*/pwm1 | sort | head -1 | xargs -I{} echo pwm_fan {} >> /etc/thinkfan.conf
systemctl restart thinkfan
}
done
}
+
+# echo variable array
+eva() {
+ local a arg="$1"
+ # shellcheck disable=all # this outputs code and is expected to confuse shellcheck
+ for a in \"\${$arg[@]}\"; do
+ echo "$a"
+ done
+}
+
+
# emacs ediff from cli
ediff() {
[[ ${#@} == 2 ]] || { echo "error: ediff requires 2 arguments"; return 1; }
}
# mkdir the last arg, then cp the remaining args into it
mkcp() {
+ # shellcheck disable=SC2124 # false positive
mkdir -p "${@: -1}"
cp "${@:1:$#-1}" "${@: -1}"
}
# mkdir the last arg, then mv the remaining args into it
mkmv() {
+ # shellcheck disable=SC2124 # false positive
mkdir -p "${@: -1}"
mv "${@:1:$#-1}" "${@: -1}"
}
# .bashrc. This means the outer shell still ran the default .bashrc,
# but that is the best we can do.
- local now args remote dorsync haveinfo tmpa sshinfo tmp tmp2 host_type info_sec force_rsync \
+ local verbose_arg now args remote do_rsync haveinfo tmpa sshinfo tmp tmp2 host_type info_sec force_rsync \
sync_dirname testcmd extra_info testbool files_sec sl_test_cmd sl_test_hook
declare -a args tmpa
# [-O ctl_cmd] [-o option] [-p port] [-Q query_option] [-R address]
# [-S ctl_path] [-W host:port] [-w local_tun[:remote_tun]]
+ # shellcheck disable=SC3127 # todo: remove this once we use this var
verbose_arg=false
force_rsync=false
if [[ $1 == --rsync ]]; then
-[46AaCfGgKkMNnqsTtVvXxYy]*)
if [[ $1 == *v* ]]; then
# todo: try running slowdo if this is false
+ # shellcheck disable=SC2034 # todo: remove this once we use this var
verbose_arg=true
fi
args+=("$1"); shift
if [[ ! $PS1 =~ 133 ]] ; then
PS1='\[\e]133;A\a\]'"$PS1"'\[\e]133;B\a\]'
- PS2='\[\e]133;A\a\]'"$PS2"'\[\e]133;B\a\]'
# shellcheck disable=SC2034 # false positive
PS0='\[\e]133;C\a\]'
fi
+ if [[ ! $PS2 =~ 133 ]]; then
+ PS2='\[\e]133;A\a\]'"$PS2"'\[\e]133;B\a\]'
+ fi
fi
}
source /a/c/brc3
}
+# Populate the array f with files, picking them by editing an ls file listing in emacs.
+#
+# usage: fs [options] [ls_args]
+# -e EXCLUDED_STRING Exclude arg as a literal from ls output.
+fs() {
+ local exclude tmpe tmpf=/home/iank/tmp-fs.log
+ if [[ $1 == -e ]]; then
+ exclude="$2"
+ shift 2
+ # assume exclude is a directory and has ansi stuff, if we put that
+ # here as literals, I don't expect it to work right. Possible it
+ # could, but I'm not bothering to test.
+ tmpe=$(mktemp)
+ printf %s "$exclude" | cat /b/data/dir-ansi-prefix - /b/data/dir-ansi-suffix | tr -d '\n' >$tmpe
+ # shellcheck disable=SC2010 # i handle nonalphanumeric.
+ ls_out=$(ls -A --color=always "$@" | grep -vxFf $tmpe || [[ $? == 1 ]])
+ else
+ ls_out=$(ls -A --color=always "$@")
+ fi
+ if [[ $tmpf == *?* ]]; then
+ echo "fs: error: found possible unprintable char ? in ls output. grep ?:"
+ printf "%s\n" "$ls_out" | grep -F "?"
+ return 1
+ fi
+ printf "%s\n" "$ls_out" >$tmpf
+ emacsclient $tmpf
+ # A little hack: if we want to delete a bunch of lines all the way to
+ # the end of the file, instead, just open a blank line and we take
+ # care of it here.
+ sed -i '/^[[:space:]]*$/,$d' $tmpf
+ mapfile -t f <$tmpf
+}
+
+# mv, but select source using fs
+#
+# This assumes no options given to mv. Any options will get passed to ls.
+mvf() {
+ local dest file bad_file=false
+
+ # the last arg.
+ # shellcheck disable=SC2124 # false positive
+ dest="${@: -1}"
+ # 2nd to last arg and earlier (if they exist)
+ fs -e "$dest" "${@:1:$#-1}"
+
+ if (( ${#f[@]} == 0 )); then
+ echo "mvf: f is empty. aborting"
+ return 0
+ fi
+ for file in "${f[@]}"; do
+ if [[ ! -e $file && ! -L $file ]]; then
+ echo "mvf: error: f array file:\"$file\" not found possibly due to special charater or accidental edit." >&2
+ bad_file=true
+ fi
+ done
+ if $bad_file; then
+ return 1
+ fi
+ mv "${f[@]}" "$dest"
+}
+
+# f execute. speculating this will come in handy.
+fe() {
+ "$@" "${f[@]}"
+}
+
+
+# Save some for loop typing. Run COMMAND on each of FILES, striping any
+# leading paths.
+#
+# CD_DIRECTORY is assumed if FILES are in the current directory.
+#
+# usage: [ CD_DIRECTORY ] COMMAND... FILES..
+forf() {
+ local cdto f
+ local -a cmd files
+ while [[ $1 ]]; do
+ if [[ -e $1 ]]; then
+ if [[ $1 == */* ]]; then
+ for arg; do
+ files+=( "${arg##*/}" )
+ done
+ else
+ if [[ -d $1 ]]; then
+ cdto="${cmd[0]}"
+ shift
+ fi
+ files=("$@")
+ fi
+ break
+ fi
+ cmd+=("$1")
+ shift
+ done
+ if [[ $cdto ]]; then
+ {
+ cd "$cdto"
+ for f in "${files[@]}"; do
+ "${cmd[@]:1}" "$f"
+ done
+ }
+ else
+ for f in "${files[@]}"; do
+ "${cmd[@]}" "$f"
+ done
+ fi
+}
+
+# exists or print. aka exists predicate.
+#
+# Print any args that are nonexistent files.
+ep() {
+ local f
+ for f; do
+ if [[ ! -e $f ]]; then
+ e "$f"
+ fi
+ done
+}
+
# * stuff that makes sense to be at the end
# s schroot -c flidas update-locale LANG=en_US.UTF-8
mkschroot() {
- local sources force repo n distro
+ local sources force repo n codename
force=false
while [[ $1 == -* ]]; do
case $1 in
beetrating() {
local ssh_prefix
source /p/c/domain-info
- if [[ $HOSTNAME != $d_host ]]; then
+ if [[ $HOSTNAME != "$d_host" ]]; then
ssh_prefix="ssh b8.nz"
fi
# shellcheck disable=SC2016 # obvious reason
# note: logic duplicated in beetpull
local remote_p=true
source /p/c/domain-info
- if [[ $HOSTNAME == $d_host ]]; then
+ if [[ $HOSTNAME == "$d_host" ]]; then
remote_p=false
fi
local sshfs_host sshfs_cmd
sshfs_host=b8.nz
source /p/c/domain-info
- if [[ $HOSTNAME == $d_host ]]; then
+ if [[ $HOSTNAME == "$d_host" ]]; then
return 0
fi
if [[ ! -e /i ]]; then
local tmpf id
tmpf=$(mktemp)
source /p/c/domain-info
- if [[ $HOSTNAME != $d_host ]]; then
+ if [[ $HOSTNAME != "$d_host" ]]; then
echo "error: run on kd"
return 1
fi
ns=$1
unit=$2
shift 2
- pid=$(servicepid -n $unit)
+ pid=$(servicepid $unit)
env-tmpf "$@"
if $alt_user; then
final_args=("$@")
shift 2
## end command line args ##
- pid=$(servicepid -n $unit)
+ pid=$(servicepid $unit)
env-tmpf "$@"
if $alt_user; then
final_args=("$@")
pushd /home/iank/.local/share/profanity/chatlogs/iank_at_fsf.org/rooms/office_at_conference.fsf.org
logs=(*)
cd /home/iank/.local/share/profanity/chatlogs/iank_at_fsf.org/rooms/sys-private_at_conference.fsf.org
- logs=+(*)
- logs=( $( printf "%s\n" ${logs[*]} | sort -u ) )
+ logs+=(*)
+ tmps=$( printf "%s\n" ${logs[*]} | sort -u )
+ mapfile -t logs <<<"$tmps"
cd /home/iank/.local/share/profanity/chatlogs/iank_at_fsf.org/rooms
logcount=${#logs[@]}
if (( logcount > 32 )); then
}
# xorg copy. copy text piped into command, or copy file(s) if given
+# shellcheck disable=SC2120 # intentional
xc() {
xclip -r -selection clipboard "$@"
}
:
}
trg() { transmission-remote-gtk & r; }
-# TODO: this wont work transmission.lan doesnt exist
+
+## transmission cli client
+# examples:
+# set global upload limit to 100 kilobytes:
+# trc -u 100
+# get detailed info on all torrents (note: -j would be nice but it doesn't work).
+# trc -t all -i
trc() {
- # example, set global upload limit to 100 kilobytes:
- # trc -u 100
- TR_AUTH=":$(jq -r .profiles[0].password ~/.config/transmission-remote-gtk/config.json)" transmission-remote transmission.lan -ne "$@"
+
+ source /p/c/domain-info
+ d_host_suffix=$(awk '$2 == "'$d_host'" {print $1}' /p/c/host-info)
+ TR_AUTH="transmission:$(</p/transmission-rpc-pass)" transmission-remote 10.174.$d_host_suffix.2 --authenv "$@"
}
trysleep() {
fi
}
-# Check that ns of pid $1 really exists, like joins-namespace-of-check
+# Check that network ns of pid $1 really exists, like joins-namespace-of-check
ns-exists() {
local service_ns default_ns pid
pid="$1"
# Get pid of systemd service
#
-# -n also call ns-exists on pid.
+# We also call ns-exists on pid if we see PrivateNetwork=true in its config.
servicepid() {
- local pid unit dir ns_check=false
- if [[ $1 == -n ]]; then
- ns_check=true
- shift
- fi
+ local pid unit dir
unit="$1"
pid=$(systemctl show --property MainPID --value "$unit")
case $pid in
;;
esac
if [[ $pid ]]; then
- ns-exists "$pid"
+ if ser cat "$unit" | grep -xFq PrivateNetwork=true; then
+ ns-exists "$pid"
+ fi
printf "%s\n" "$pid"
else
return 1
return 1
fi
unit=$1
- pid=$(servicepid -n $unit)
+ pid=$(servicepid $unit)
m sudo nsenter -t $pid -n -m sudo -u $USER -i bash
}
return 1
fi
unit=$1
- pid=$(servicepid -n $unit)
+ pid=$(servicepid $unit)
m sudo nsenter -t $pid -n -m bash
}
unit=$1
shift
- pid=$(servicepid -n $unit)
+ pid=$(servicepid $unit)
env-tmpf "$@"
if $alt_user; then
final_args=("$@")
fi
unit=$1
shift
- pid=$(servicepid -n $unit)
+ pid=$(servicepid $unit)
m sudm nsenter -t $pid -n -m "$@"
}
# we could just set those explicity, PATH is the main one. It also
# seems less secure since another process could modify the temp file.
env-tmpf() {
- if [[ $user != $USER ]]; then
+ if [[ $user != "$USER" ]]; then
tmpf=$(sudo -u $user mktemp --tmpdir $unit.XXXXXXXXXX)
sudo chmod 660 $tmpf
sudo chown iank $tmpf
fi
unit=$1
shift
- pid=$(servicepid -n $unit)
+ pid=$(servicepid $unit)
env-tmpf "$@"
m sudo nsenter -t $pid -n sudo -u $USER -i bash -c ". $tmpf"
}
for host in ${active_hosts[@]}; do
host=${host%wg}
- if [[ $host == $HOSTNAME ]]; then
+ if [[ $host == "$HOSTNAME" ]]; then
continue
fi
hosts+=($host)
spdx -f ~/.spd/spd/spd_data_financial.gpg "$@"
}
+# copy from spd
# note: if no prompt and no error, that means we found a single pass and
# put it i the clipboard.
spdx() {
}
snap-last() {
+ # shellcheck disable=SC2012 # not relevant since this is for printing
ls -lad /mnt/o/btrbk/o.* | tail -n2
for sub in a q; do
+ # shellcheck disable=SC2012 # not relevant since this is for printing
ls -lad /mnt/root/btrbk/$sub.* | tail -n2
done
}
scp -ra --delete iank@$pull_host:.config/chromium /home/iank/.config
}
+linediff() {
+ read -r l1
+ read -r l2
+ meld <(printf "%s\n" "$l1") <(printf "%s\n" "$l2") &
+}
+
export BASEFILE_DIR=/a/bin/fai-basefiles
#export ANDROID_HOME=/a/opt/android-home
noble=$(echo ${prefix}ubuntu.com_ubuntu_dists_noble{,-security,-updates}_{main,universe}_binary-amd64_Packages)
ecne=$(echo ${prefix}trisquel.org_trisquel_dists_ecne{,-updates,-security}_main_binary-amd64_Packages)
test-ecne-noble-package-lists-exist
- u24_kernel_pkgs=virtual|oem|image|generic|firmware|aws|azure|buildinfo|cloud|gcp|gke|headers|ibm|lowlatency|modules|nvidia|riscv|tools|intel|oracle|lib-rust
+ u24_kernel_pkgs="virtual|oem|image|generic|firmware|aws|azure|buildinfo|cloud|gcp|gke|headers|ibm|lowlatency|modules|nvidia|riscv|tools|intel|oracle|lib-rust"
for dist in ecne noble; do
+ # shellcheck disable=SC2094 # false positive
{
grep-dctrl -F package -v -e "ubuntu|zfs|thunderbird|snapd|microcode|^linux-($u24_kernel_pkgs)" ${!dist} | \
grep-dctrl -s package -n -F depends,pre-depends -v snapd -
Send btrbk for root2
Note, this hasn't been used in a long time. The general use case is:
-we collect ziva backups on $d_host, then we could use this script to
+we collect ziva backups on \$d_host, then we could use this script to
push them all onto a laptop in order to restore them.
-h|--help Print help and exit.
# limitations under the License.
this_file="$(readlink -f -- "${BASH_SOURCE[0]}")"
-readonly this_file this_dir="${this_file%/*}"
[[ $EUID == 0 ]] || exec sudo -E "$this_file" "$@"
source /a/bin/bash-bear-trap/bash-bear
echo "######## begin clipboard history ########"
for ((i=0; i<copyqcount; i++)); do
copyq read $i
- echo -n "$i "; done)
-echo "######## press x or enter to clear clipboard history. global key is super-y ########"
+ echo -n "$i "
+done
+echo
+echo "######## clearing in 10 seconds (or press enter or x). global key is super-y ########"
read -rsN1 -t 10 input
if [[ ! $input || $input == x ]]; then
echo "running copyq-restart"
source /etc/profile.d/environment.sh
export LC_USEBASHRC=t
# shellcheck source=./brc
-source ~/brc
+source /a/c/brc
err-catch
$interactive || set -x
/a/exe/ssh-emacs-setup
fi
-if [[ $HOSTNAME == $d_host ]] && ! mountpoint /d &>/dev/null; then
+if [[ $HOSTNAME == "$d_host" ]] && ! mountpoint /d &>/dev/null; then
cat <<'EOFOUTER'
# if this is a fresh reinstall, need to run something like this
# to restore data:
# own umask based on it's settings file. Well, no harm leaving this
# so it's set right from the beginning.
sudo chfn debian-transmission -o umask=0002
+sudo usermod -a -G debian-transmission iank
# note i had to do this, which is persistent:
# cd /i/k
sudo chown -R debian-transmission:debian-transmission /var/lib/transmission-daemon
#
# config file documented here, and it\'s the same config
-# for daemon vs client, so it\'s documented in the gui.
+# for daemon vs non-daemon, so it\'s documented in the gui.
# https://trac.transmissionbt.com/wiki/EditConfigFiles#Options
#
# I originaly setup rpc-whitelist, but after using
# It is a read & write cache.
#
# just fyi: default rpc port is 9091
-if ! systemctl is-active transmission-daemon-nn &>/dev/null && \
- ! systemctl is-active transmission-daemon; then
- tmp=$(mktemp)
- command sudo ruby <<EOF >$tmp
+d_host_suffix=$(awk '$2 == "'$d_host'" {print $1}' /p/c/host-info)
+u ~/.config/transmission-daemon-iank.rb <<EOF
require 'json'
p = '/etc/transmission-daemon/settings.json'
s = {
'rpc-whitelist-enabled' => false,
- 'rpc-authentication-required' => false,
+ 'rpc-host-whitelist-enabled' => false,
+ 'rpc-authentication-required' => true,
+ 'rpc-bind-address' => '10.174.$d_host_suffix.2',
'incomplete-dir' => '$tdir/partial-torrents',
'incomplete-dir-enabled' => true,
'download-dir' => '$tdir/torrents',
"cache-size-mb" => 256,
"ratio-limit" => 5.0,
"ratio-limit-enabled" => false,
+ "umask" => "002",
+$(if [[ -e /p/transmission-rpc-pass ]]; then echo '"rpc-password" => File.read("/p/transmission-rpc-pass").chomp,'; fi)
}
puts(JSON.pretty_generate(JSON.parse(File.read(p)).merge(s)))
EOF
- cat $tmp | sudo dd of=/etc/transmission-daemon/settings.json
-
+# shellcheck disable=SC2154 # false positive
+if $ur || ! sudo test -s /etc/transmission-daemon/settings.json; then
+ restart_ser=false
+ ser=transmission-daemon-nn
+ if ser is-active $ser &>/dev/null; then
+ m ser stop $ser
+ restart_ser=true
+ fi
+ tmpf=$(mktemp)
+ # shellcheck disable=SC2024 # false positive
+ if sudo ruby <~/.config/transmission-daemon-iank.rb >$tmpf; then
+ sudo dd of=/etc/transmission-daemon/settings.json <$tmpf
+ else
+ echo "iank ruby transmission error" >&2
+ exit 1
+ fi
+ if $restart_ser; then
+ m ser start $ser
+ fi
fi
####### end transmission
# auto-connect
# password
- # the password is randomly generated on first run, i copied it out
- # so it could be used by other hosts.
- sudo ruby <<'EOF'
-require 'json'
-p = '/etc/transmission-daemon/settings.json'
-s = JSON.parse(File.read(p))
-s["rpc-password"] = File.read("/p/transmission-rpc-pass").chomp
-# default is 0022 (18 in decimal)
-s["umask"] = 2
-File.write p, JSON.pretty_generate(s)
-EOF
-
rpc_pass=$(</p/transmission-rpc-pass)
for f in /home/*; do
u=${f##*/}
fi
d=$f/.config/transmission-remote-gtk
sudo -u $u mkdir -p $d
- d_host_suffix=$(awk '$2 == "'$d_host'" {print $1}' /p/c/host-info)
# i tried setting hostname to transmission.b8.nz, so i could dynamically change where
# this connects to, but it said some 421 denied error when I did that. Then it
# froze X when i ran it under strace. Whatever.
url=$host/fsf$mount_suffix.webm
files=(~/2*.webm)
-file=${files[@]}
+file=${files[0]}
if [[ -e $file ]]; then
url=$file
fi
# https://github.com/transmission/transmission/issues/6991
#Type=notify
Type=simple
-ExecStartPre=/usr/local/bin/joins-namespace-of-check openvpn-client-tr@client
-ExecStart=/usr/bin/transmission-daemon -f --log-error
+ExecStartPre=+/usr/local/bin/joins-namespace-of-check -p system-openvpn\\x2dclient\\x2dtr.slice openvpn-client-tr@client
+ExecStart=/usr/bin/transmission-daemon -f --log-level=error
ExecReload=/bin/kill -s HUP $MAINPID
PrivateNetwork=true
Nice=19
set -eE -o pipefail
trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+slice_dir=/sys/fs/cgroup/system.slice
+if [[ $1 == -p ]]; then
+ dir="$2"
+ shift 2
+ slice_dir=$slice_dir/$dir
+fi
+
+sleep 1
unit="$1"
-pid=$(head -n1 /sys/fs/cgroup/system.slice/$unit.service/cgroup.procs)
+pid=$(head -n1 "$slice_dir"/$unit.service/cgroup.procs)
ns=$(readlink /proc/$pid/ns/net)
default_ns=$(readlink /proc/1/ns/net)
remote=$1
else
remote=prof
- if systemctl --user --quiet is-active profanity || [[ $HOSTNAME == $d_host ]]; then
+ if systemctl --user --quiet is-active profanity || [[ $HOSTNAME == "$d_host" ]]; then
dossh=false
fi
fi
source /p/c/domain-info
-if [[ $HOSTNAME != $d_host ]]; then
+if [[ $HOSTNAME != "$d_host" ]]; then
shell_pre="ssh iank@b8.nz"
rsync_pre=b8.nz:
fi
# eg, in an ssh shell. confirm for regular user provides some protection
# that a rouge user program cant use my ssh key.
#
- # HOME is not set in systemd services
+ # note: HOME is not set in systemd services
+ # shellcheck disable=SC2016 # intentional
sed 's,^AddKeysToAgent confirm,AddKeysToAgent yes,;s,\${HOME},/root,g;/^UserKnownHostsFile /d' $user_ssh_dir/config >/root/.ssh/confighome
# having a different control path avoids the problem of
# forgetting to use confighome, and then after specifying it,
local pids i sig first_pid
if ! (( ${#kill_dirs[@]} >= 1 )); then
- echo "kill-dir: error: ${kill_dirs[@]} is empty!"
+ echo "kill-dir: error: \${kill_dirs[@]} is empty!"
exit 1
fi
local umount_kill_dir killed_dir
for umount_kill_dir; do
if ! mountpoint -q $umount_kill_dir; then
- echo "expected mountpoint args, got $dir"
+ echo "umount-kill: expected mountpoint arg, got: $umount_kill_dir"
return 1
fi
done
umount_ret=true
for killed_dir in ${kill_dirs[@]}; do
if ! m umount -R $killed_dir; then
- echo "$0: ERROR: failed to umount $dir." >&2
+ echo "$0: ERROR: failed to umount killed_dir:$killed_dir." >&2
+ # shellcheck disable=SC2034 # false positive
umount_ret=false
+ # shellcheck disable=SC2034 # false positive
ret=1
fi
done
sleep 1
cd "/a/opt/emacs-$(distro-name)$(distro-num)"
sudo gdb -p "$(pgrep -f 'emacs --daemon')" -ex c
+ # note: this is dead code since this is called as a script.
+ # shellcheck disable=SC2103 # preference for simplicity.
cd -
else
emacsclient -a "" $args "$@"
#bindsym $mod+shift+e
bindsym $mod+r $ex "/a/bin/ds/xl"
-bindsym $mod+backslash $ex "gnome-screenshot"
+bindsym $mod+backslash $ex "scrot"
bindsym $mod+t $ex "i3-set-layout splitv"
StartLimitIntervalSec=0
[Service]
-ExecStartPre=/usr/local/bin/joins-namespace-of-check mailnn
+ExecStartPre=+/usr/local/bin/joins-namespace-of-check mailnn
PrivateNetwork=true
BindPaths=$bindpaths
Restart=always
# better du in t11+
duf
duplicity
+ dwdiff
elinks
evince
# used by digikam, it complains in stdout if its not there.
shuf | head -n1)
echo $clip >/tmp/last-$type
else
- clip=./*
+ # quoted just to satisfy shellcheck
+ clip="./*"
fi
;;
esac
iankelling.org / git / distro-setup / commitdiff