From b2a2c6927998530095e2dfb0c6f5f84563cebccf Mon Sep 17 00:00:00 2001
From: xerus2000 <27jf@pm.me>
Date: Sat, 23 Jan 2021 19:51:23 +0100
Subject: [PATCH] bin: update and move scripts & git config

---
 .config/git/config                              |   9 +++++----
 .config/shell/functions                         |   2 +-
 .config/zsh/.zshrc                              |   2 +-
 .local/bin/bak                                  |   2 --
 .local/bin/git-l                                |   2 --
 .local/bin/scripts/arg-test                     |   4 ++++
 .local/bin/{ => scripts}/b                      |   0
 .local/bin/scripts/bak                          |   2 ++
 .local/bin/{ => scripts}/box                    |   0
 .local/bin/{ => scripts}/dif                    |   0
 .local/bin/{ => scripts}/edit                   |   0
 .local/bin/{ => scripts}/ex                     |   0
 .local/bin/{ => scripts}/favicon                |   0
 .local/bin/{ => scripts}/focus                  |   0
 .local/bin/{ => scripts}/game                   |   0
 .local/bin/{ => scripts}/git-child              |   0
 .local/bin/scripts/git-l                        |   2 ++
 .local/bin/{ => scripts}/git-lno                |   0
 .local/bin/{ => scripts}/git-rc                 |   0
 .local/bin/{ => scripts}/git-ready              |   0
 .local/bin/{ => scripts}/git-rebranch           |   0
 .local/bin/{ => scripts}/git-recache            |   0
 .local/bin/{ => scripts}/git-rmbranch           |   6 +++---
 .local/bin/{ => scripts}/git-rmgonebranches     |   0
 .local/bin/{ => scripts}/git-snap               |   0
 .local/bin/{ => scripts}/git-snap-restore       |   0
 .local/bin/{ => scripts}/git-week               |   0
 .local/bin/{ => scripts}/launch                 |   0
 .local/bin/{ => scripts}/log                    |   0
 .local/bin/{ => scripts}/mdoh                   |   0
 .local/bin/{ => scripts}/moul                   |   0
 .local/bin/{ => scripts}/mvk                    |   0
 .local/bin/{ => scripts}/note                   |   0
 .local/bin/{ => scripts}/pdf-parser.py          |   0
 .local/bin/scripts/retest                       |  10 ++++++++++
 .local/bin/{ => scripts}/s                      |   3 ++-
 .local/bin/{ => scripts}/sd                     |   0
 .local/bin/{ => scripts}/setupScreens           |   0
 .local/bin/{ => scripts}/shrinkpdf              |   0
 .local/bin/{ => scripts}/susrave                |   0
 .local/bin/scripts/tl                           |   3 +++
 .local/bin/{ => scripts}/update-keyboard-layout |   0
 .local/bin/{ => scripts}/vosk                   |   0
 .local/bin/{ => scripts}/vp                     |   0
 .local/bin/{ => scripts}/work                   |   0
 .local/bin/{ => scripts}/wr                     |   0
 .local/bin/{ => scripts}/x                      |   0
 .local/bin/{ => scripts}/xkblayout-state        | Bin
 .local/bin/trl                                  |   2 --
 49 files changed, 33 insertions(+), 16 deletions(-)
 delete mode 100755 .local/bin/bak
 delete mode 100755 .local/bin/git-l
 create mode 100755 .local/bin/scripts/arg-test
 rename .local/bin/{ => scripts}/b (100%)
 create mode 100755 .local/bin/scripts/bak
 rename .local/bin/{ => scripts}/box (100%)
 rename .local/bin/{ => scripts}/dif (100%)
 rename .local/bin/{ => scripts}/edit (100%)
 rename .local/bin/{ => scripts}/ex (100%)
 rename .local/bin/{ => scripts}/favicon (100%)
 rename .local/bin/{ => scripts}/focus (100%)
 rename .local/bin/{ => scripts}/game (100%)
 rename .local/bin/{ => scripts}/git-child (100%)
 create mode 100755 .local/bin/scripts/git-l
 rename .local/bin/{ => scripts}/git-lno (100%)
 rename .local/bin/{ => scripts}/git-rc (100%)
 rename .local/bin/{ => scripts}/git-ready (100%)
 rename .local/bin/{ => scripts}/git-rebranch (100%)
 rename .local/bin/{ => scripts}/git-recache (100%)
 rename .local/bin/{ => scripts}/git-rmbranch (52%)
 rename .local/bin/{ => scripts}/git-rmgonebranches (100%)
 rename .local/bin/{ => scripts}/git-snap (100%)
 rename .local/bin/{ => scripts}/git-snap-restore (100%)
 rename .local/bin/{ => scripts}/git-week (100%)
 rename .local/bin/{ => scripts}/launch (100%)
 rename .local/bin/{ => scripts}/log (100%)
 rename .local/bin/{ => scripts}/mdoh (100%)
 rename .local/bin/{ => scripts}/moul (100%)
 rename .local/bin/{ => scripts}/mvk (100%)
 rename .local/bin/{ => scripts}/note (100%)
 rename .local/bin/{ => scripts}/pdf-parser.py (100%)
 create mode 100755 .local/bin/scripts/retest
 rename .local/bin/{ => scripts}/s (52%)
 rename .local/bin/{ => scripts}/sd (100%)
 rename .local/bin/{ => scripts}/setupScreens (100%)
 rename .local/bin/{ => scripts}/shrinkpdf (100%)
 rename .local/bin/{ => scripts}/susrave (100%)
 create mode 100755 .local/bin/scripts/tl
 rename .local/bin/{ => scripts}/update-keyboard-layout (100%)
 rename .local/bin/{ => scripts}/vosk (100%)
 rename .local/bin/{ => scripts}/vp (100%)
 rename .local/bin/{ => scripts}/work (100%)
 rename .local/bin/{ => scripts}/wr (100%)
 rename .local/bin/{ => scripts}/x (100%)
 rename .local/bin/{ => scripts}/xkblayout-state (100%)
 delete mode 100755 .local/bin/trl

diff --git a/.config/git/config b/.config/git/config
index 39ae0e5..898b954 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -1,9 +1,9 @@
 [core]
 	autocrlf = input
 	editor = nvim
-	pager = diffr | less -R
+	pager = diffr --colors refine-added:none:background:0x33,0x66,0x33:bold --colors added:none:background:0x33,0x44,0x33 --colors refine-removed:none:background:0x66,0x33,0x33:bold --colors removed:none:background:0x44,0x33,0x33 | less --RAW-CONTROL-CHARS --quit-on-intr
 [interactive]
-	diffFilter = diffr
+	diffFilter = diffr --colors refine-added:none:background:0x33,0x66,0x33:bold --colors added:none:background:0x33,0x44,0x33 --colors refine-removed:none:background:0x66,0x33,0x33:bold --colors removed:none:background:0x44,0x33,0x33
 [submodule]
 	recurse = true
 [rerere]
@@ -19,6 +19,7 @@
 
 [diff]
 	tool = nvim
+	submodule = log
 [merge]
 	tool = nvim
 [mergetool "nvim"]
@@ -125,7 +126,7 @@
 
 	# Change remote
 	luu = !git pull upstream $(git curbranch) && git push --no-verify
-	p = push
+	p = push -u
 	pf = push --force-with-lease
 	cap = !git commit --all --amend --no-edit && git push --force-with-lease
 
@@ -135,7 +136,7 @@
 	cgit    = !yadm cme "config/git:"   -- $XDG_CONFIG_HOME/git $CONFIG_SHELLS/git $HOME/.local/bin/git-*
 	cvim    = !yadm cme "config/nvim:"  -- $XDG_CONFIG_HOME/nvim/init*
 	cshell  = !yadm cme "config/shell:" -- $CONFIG_SHELLS
-	cbin    = !yadm cme "bin:"          -- $HOME/.local/bin
+	cbin    = !yadm cme "bin:"          -- $HOME/.local/bin/scripts/
 
 	# data
 	journal = !git cme "notes/journal:" -- $(git root)/2-standards/notes/journal
diff --git a/.config/shell/functions b/.config/shell/functions
index 4c73661..2841ad9 100644
--- a/.config/shell/functions
+++ b/.config/shell/functions
@@ -78,7 +78,7 @@ edshell() {
 }
 
 edbin() {
-  file="$(f=$(which $1) && test -f "$f" && echo $f || echo "$HOME/.local/bin/$1")"
+  file="$(f=$(which $1) && test -f "$f" && echo $f || echo "$HOME/.local/bin/scripts/$1")"
   edit "$file"
   case "$file" in ($HOME*) yadm add "$file";; esac
 }
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index d88a1a2..9f69483 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -12,7 +12,7 @@ fi 2>/dev/null || return 0
 #	source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
 #fi
 
-export PATH=$HOME/.local/bin:$PATH:/opt/android/sdk/platform-tools
+export PATH=$HOME/.local/bin/scripts:$HOME/.local/bin:$PATH:/opt/android/sdk/platform-tools
 
 export CONFIG_ZSH="$XDG_CONFIG_HOME/zsh"
 export CONFIG_SHELLS="$XDG_CONFIG_HOME/shell"
diff --git a/.local/bin/bak b/.local/bin/bak
deleted file mode 100755
index 1ca863f..0000000
--- a/.local/bin/bak
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-test -f "$1.bak" && (mv "$1" /tmp && mv "$1.bak" "$1") || mv "$1" "$1.bak"
diff --git a/.local/bin/git-l b/.local/bin/git-l
deleted file mode 100755
index 8c856b1..0000000
--- a/.local/bin/git-l
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-git pull --rebase --recurse-submodules --autostash "$@" || (printf "\e[31;1mError - aborting rebase!\e[0m\n" >&2 && git rebase --abort)
diff --git a/.local/bin/scripts/arg-test b/.local/bin/scripts/arg-test
new file mode 100755
index 0000000..7952743
--- /dev/null
+++ b/.local/bin/scripts/arg-test
@@ -0,0 +1,4 @@
+#!/bin/sh
+echo "Args: $@"
+echo "Number of args: $#"
+echo "${@:-default}" | sed 's/\(\w\+\)/\1+sed/g'
diff --git a/.local/bin/b b/.local/bin/scripts/b
similarity index 100%
rename from .local/bin/b
rename to .local/bin/scripts/b
diff --git a/.local/bin/scripts/bak b/.local/bin/scripts/bak
new file mode 100755
index 0000000..4d239ba
--- /dev/null
+++ b/.local/bin/scripts/bak
@@ -0,0 +1,2 @@
+#!/bin/sh
+test -e "$1.bak" && ((test -e "$1" && mv "$1" /tmp); mv -n "$1.bak" "$1") || mv -n "$1" "$1.bak"
diff --git a/.local/bin/box b/.local/bin/scripts/box
similarity index 100%
rename from .local/bin/box
rename to .local/bin/scripts/box
diff --git a/.local/bin/dif b/.local/bin/scripts/dif
similarity index 100%
rename from .local/bin/dif
rename to .local/bin/scripts/dif
diff --git a/.local/bin/edit b/.local/bin/scripts/edit
similarity index 100%
rename from .local/bin/edit
rename to .local/bin/scripts/edit
diff --git a/.local/bin/ex b/.local/bin/scripts/ex
similarity index 100%
rename from .local/bin/ex
rename to .local/bin/scripts/ex
diff --git a/.local/bin/favicon b/.local/bin/scripts/favicon
similarity index 100%
rename from .local/bin/favicon
rename to .local/bin/scripts/favicon
diff --git a/.local/bin/focus b/.local/bin/scripts/focus
similarity index 100%
rename from .local/bin/focus
rename to .local/bin/scripts/focus
diff --git a/.local/bin/game b/.local/bin/scripts/game
similarity index 100%
rename from .local/bin/game
rename to .local/bin/scripts/game
diff --git a/.local/bin/git-child b/.local/bin/scripts/git-child
similarity index 100%
rename from .local/bin/git-child
rename to .local/bin/scripts/git-child
diff --git a/.local/bin/scripts/git-l b/.local/bin/scripts/git-l
new file mode 100755
index 0000000..16f19ac
--- /dev/null
+++ b/.local/bin/scripts/git-l
@@ -0,0 +1,2 @@
+#!/bin/sh
+git pull --rebase --autostash "$@" || (printf "\e[31;1mError - aborting rebase!\e[0m\n" >&2 && git rebase --abort)
diff --git a/.local/bin/git-lno b/.local/bin/scripts/git-lno
similarity index 100%
rename from .local/bin/git-lno
rename to .local/bin/scripts/git-lno
diff --git a/.local/bin/git-rc b/.local/bin/scripts/git-rc
similarity index 100%
rename from .local/bin/git-rc
rename to .local/bin/scripts/git-rc
diff --git a/.local/bin/git-ready b/.local/bin/scripts/git-ready
similarity index 100%
rename from .local/bin/git-ready
rename to .local/bin/scripts/git-ready
diff --git a/.local/bin/git-rebranch b/.local/bin/scripts/git-rebranch
similarity index 100%
rename from .local/bin/git-rebranch
rename to .local/bin/scripts/git-rebranch
diff --git a/.local/bin/git-recache b/.local/bin/scripts/git-recache
similarity index 100%
rename from .local/bin/git-recache
rename to .local/bin/scripts/git-recache
diff --git a/.local/bin/git-rmbranch b/.local/bin/scripts/git-rmbranch
similarity index 52%
rename from .local/bin/git-rmbranch
rename to .local/bin/scripts/git-rmbranch
index fe4bbca..0ae089d 100755
--- a/.local/bin/git-rmbranch
+++ b/.local/bin/scripts/git-rmbranch
@@ -2,6 +2,6 @@
 # Removes the given branch locally and remotely.
 # With no argument it switches to the default branch and deletes the current branch.
 branch=${1:-$(git curbranch)}
-git push -d $(git rev-parse --abbrev-ref $branch@{push} | sed 's/\// /' || echo origin $branch)
-test $1 || git checkout main || git checkout master || git checkout $(cat .git/refs/remotes/origin/HEAD | cut -d'/' -f4)
-git branch -D $branch
+echo "${@:-$branch}" | sed 's/\([^ ]\+\)/\1@{push}/g' | xargs git rev-parse --abbrev-ref --revs-only | sed 's/\// /' | git push -d
+test $1 || git checkout main || git checkout master || git checkout $(cat .git/refs/remotes/origin/HEAD | cut -d'/' -a)
+git branch -D "${@:-$branch}"
diff --git a/.local/bin/git-rmgonebranches b/.local/bin/scripts/git-rmgonebranches
similarity index 100%
rename from .local/bin/git-rmgonebranches
rename to .local/bin/scripts/git-rmgonebranches
diff --git a/.local/bin/git-snap b/.local/bin/scripts/git-snap
similarity index 100%
rename from .local/bin/git-snap
rename to .local/bin/scripts/git-snap
diff --git a/.local/bin/git-snap-restore b/.local/bin/scripts/git-snap-restore
similarity index 100%
rename from .local/bin/git-snap-restore
rename to .local/bin/scripts/git-snap-restore
diff --git a/.local/bin/git-week b/.local/bin/scripts/git-week
similarity index 100%
rename from .local/bin/git-week
rename to .local/bin/scripts/git-week
diff --git a/.local/bin/launch b/.local/bin/scripts/launch
similarity index 100%
rename from .local/bin/launch
rename to .local/bin/scripts/launch
diff --git a/.local/bin/log b/.local/bin/scripts/log
similarity index 100%
rename from .local/bin/log
rename to .local/bin/scripts/log
diff --git a/.local/bin/mdoh b/.local/bin/scripts/mdoh
similarity index 100%
rename from .local/bin/mdoh
rename to .local/bin/scripts/mdoh
diff --git a/.local/bin/moul b/.local/bin/scripts/moul
similarity index 100%
rename from .local/bin/moul
rename to .local/bin/scripts/moul
diff --git a/.local/bin/mvk b/.local/bin/scripts/mvk
similarity index 100%
rename from .local/bin/mvk
rename to .local/bin/scripts/mvk
diff --git a/.local/bin/note b/.local/bin/scripts/note
similarity index 100%
rename from .local/bin/note
rename to .local/bin/scripts/note
diff --git a/.local/bin/pdf-parser.py b/.local/bin/scripts/pdf-parser.py
similarity index 100%
rename from .local/bin/pdf-parser.py
rename to .local/bin/scripts/pdf-parser.py
diff --git a/.local/bin/scripts/retest b/.local/bin/scripts/retest
new file mode 100755
index 0000000..3aa655c
--- /dev/null
+++ b/.local/bin/scripts/retest
@@ -0,0 +1,10 @@
+#!/bin/sh
+# Execute a gradle task (default test) until it fails
+code=0
+case "$1" in ([0-9]*) code=$1; shift;; esac
+
+task="${1:-test}"
+test $# -gt 1 && prefix=":$2:"
+gradle=$(test -x "./gradlew" && echo "./gradlew" || echo "gradle")
+
+( exit $code ); while test $? -eq $code; do $gradle ${prefix}clean$(echo $task | sed -e 's/^./\U&/') ${prefix}$task "${@:3}"; done
diff --git a/.local/bin/s b/.local/bin/scripts/s
similarity index 52%
rename from .local/bin/s
rename to .local/bin/scripts/s
index 73e7e6b..3ffab29 100755
--- a/.local/bin/s
+++ b/.local/bin/scripts/s
@@ -2,4 +2,5 @@
 # shows size statistics for subfolders
 # max depth is equal to the first argument if it is a number or 1
 case "$1" in [0-9]) depth=$1; shift;; esac
-sudo du --max-depth "${depth:-1}" -xhat 50M "$@" | sort -h | grep -v "^0"
+(sudo du --max-depth "${depth:-1}" -xhat 50M "$@" | sort -h | grep -v "^0") ||
+  (sudo du --max-depth "${depth:-1}" -xha "$@" | sort -h | tail)
diff --git a/.local/bin/sd b/.local/bin/scripts/sd
similarity index 100%
rename from .local/bin/sd
rename to .local/bin/scripts/sd
diff --git a/.local/bin/setupScreens b/.local/bin/scripts/setupScreens
similarity index 100%
rename from .local/bin/setupScreens
rename to .local/bin/scripts/setupScreens
diff --git a/.local/bin/shrinkpdf b/.local/bin/scripts/shrinkpdf
similarity index 100%
rename from .local/bin/shrinkpdf
rename to .local/bin/scripts/shrinkpdf
diff --git a/.local/bin/susrave b/.local/bin/scripts/susrave
similarity index 100%
rename from .local/bin/susrave
rename to .local/bin/scripts/susrave
diff --git a/.local/bin/scripts/tl b/.local/bin/scripts/tl
new file mode 100755
index 0000000..44c546d
--- /dev/null
+++ b/.local/bin/scripts/tl
@@ -0,0 +1,3 @@
+#!/bin/sh
+case "$1" in [0-9]) depth=$1; shift;; esac
+tree -a -L ${depth:-3} --du -h -C "$@" | ${PAGER:-less}
diff --git a/.local/bin/update-keyboard-layout b/.local/bin/scripts/update-keyboard-layout
similarity index 100%
rename from .local/bin/update-keyboard-layout
rename to .local/bin/scripts/update-keyboard-layout
diff --git a/.local/bin/vosk b/.local/bin/scripts/vosk
similarity index 100%
rename from .local/bin/vosk
rename to .local/bin/scripts/vosk
diff --git a/.local/bin/vp b/.local/bin/scripts/vp
similarity index 100%
rename from .local/bin/vp
rename to .local/bin/scripts/vp
diff --git a/.local/bin/work b/.local/bin/scripts/work
similarity index 100%
rename from .local/bin/work
rename to .local/bin/scripts/work
diff --git a/.local/bin/wr b/.local/bin/scripts/wr
similarity index 100%
rename from .local/bin/wr
rename to .local/bin/scripts/wr
diff --git a/.local/bin/x b/.local/bin/scripts/x
similarity index 100%
rename from .local/bin/x
rename to .local/bin/scripts/x
diff --git a/.local/bin/xkblayout-state b/.local/bin/scripts/xkblayout-state
similarity index 100%
rename from .local/bin/xkblayout-state
rename to .local/bin/scripts/xkblayout-state
diff --git a/.local/bin/trl b/.local/bin/trl
deleted file mode 100755
index 47f0560..0000000
--- a/.local/bin/trl
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-tree -a -L 3 --du -h -C "$@" | ${PAGER:-less}