config/shell: fix some debugging leftovers

This commit is contained in:
xeruf 2022-03-19 16:19:50 +01:00
parent e040ac0527
commit 6d9b4d5d48
5 changed files with 10 additions and 5 deletions

View File

@ -210,10 +210,13 @@ sshl() {
lemonade server -allow 127.0.0.1 & lemonade server -allow 127.0.0.1 &
file="/var/tmp/ssh-$1" file="/var/tmp/ssh-$1"
if test ! -e "$file"; then if test ! -e "$file"; then
ssh-copy-id -i "$(ssh -G "$1" | grep "^identityfile " | head -1 | cut -d " " -f2- | sed "s|^~|$HOME|")" "$1" && touch "$file" if ! ssh -G "$1" | grep --silent "^user root$" && touch "$file"; then
ssh-copy-id -i "$(ssh -G "$1" | grep --max-count 1 "^identityfile " | cut -d " " -f2- | sed "s|^~|$HOME|")" "$1" && touch "$file"
TERM=xterm-256color kitty +kitten ssh -R 2489:127.0.0.1:2489 "$@" TERM=xterm-256color kitty +kitten ssh -R 2489:127.0.0.1:2489 "$@"
else TERM=xterm-256color ssh "$@" return $?
fi fi
fi
TERM=xterm-256color pass ssh "$@"
} }
# Listen to loopback of mic # Listen to loopback of mic

View File

@ -122,6 +122,7 @@ done
# timg: images # timg: images
# timga: potentially viewable as image # timga: potentially viewable as image
if test "$timg"; then if test "$timg"; then
# Don't show info on all images for gifs
$inspect || $elevate timg $(test "$timga" && echo "-V") --rotate=exif -g $(tput cols)x$(expr $(tput lines) / 2) \ $inspect || $elevate timg $(test "$timga" && echo "-V") --rotate=exif -g $(tput cols)x$(expr $(tput lines) / 2) \
$(test $# -gt 1 && grid=$(expr $(tput cols) / \( 30 - $# \& $# \< 25 \| 5 \)) && $(test $# -gt 1 && grid=$(expr $(tput cols) / \( 30 - $# \& $# \< 25 \| 5 \)) &&
echo "-t0.2 --center $(test $# -lt 30 && echo "--title") --grid=$((grid < $# ? grid : $#))x2") \ echo "-t0.2 --center $(test $# -lt 30 && echo "--title") --grid=$((grid < $# ? grid : $#))x2") \

View File

@ -13,5 +13,5 @@ case "$1" in
(lab) host=git@gitlab.com;; (lab) host=git@gitlab.com;;
(*) host=$1;; (*) host=$1;;
esac esac
echo "${host:-git.jfischer.org}:${3:-${user:-$(git config user.name)}}/${2:-$(basename $PWD)}.git" ;; echo "${host:-gitea@git.jfischer.org}:${3:-${user:-$(git config user.name)}}/${2:-$(basename $PWD)}.git" ;;
esac esac

View File

@ -7,10 +7,11 @@ PLAYLISTS="$MUSIC/Playlists"
LINKS="$MUSIC/links" LINKS="$MUSIC/links"
if test "$1" = "-r" if test "$1" = "-r"
then shift then shift
test "$1" = "-v" && verbose=-v && shift test "$1" = "-v" && verbose=-v && set -x && shift
# TODO this is sooo slow...
for arg for arg
do filepath="$({ find "$(dirname -- "$arg")" -maxdepth 1 -name "$(basename -- "$arg")*" -exec realpath {} + || do filepath="$({ find "$(dirname -- "$arg")" -maxdepth 1 -name "$(basename -- "$arg")*" -exec realpath {} + ||
arg-test find "$MUSIC/$(dirname -- "$arg")" "$MUSIC/Playlists/$(dirname -- "$arg")" -maxdepth 1 \ find "$MUSIC/$(dirname -- "$arg")" "$MUSIC/Playlists/$(dirname -- "$arg")" -maxdepth 1 \
-name "$(basename -- "$arg")*" -exec realpath {} +; } 2>/dev/null)" -name "$(basename -- "$arg")*" -exec realpath {} +; } 2>/dev/null)"
test -n "$verbose" && echo "Scanning path '$filepath' $( test -n "$verbose" && echo "Scanning path '$filepath' $(
test "$arg" != "$filepath" && echo "from '$arg' ")(MUSIC: '$MUSIC', PWD: '$PWD')" >&2 test "$arg" != "$filepath" && echo "from '$arg' ")(MUSIC: '$MUSIC', PWD: '$PWD')" >&2