File tree 5 files changed +10
-5
lines changed
5 files changed +10
-5
lines changed File renamed without changes.
Original file line number Diff line number Diff line change @@ -210,10 +210,13 @@ sshl() {
210
210
lemonade server -allow 127.0.0.1 &
211
211
file="/var/tmp/ssh-$1"
212
212
if test ! -e "$file"; then
213
- ssh-copy-id -i "$(ssh -G "$1" | grep "^identityfile " | head -1 | cut -d " " -f2- | sed "s|^~|$HOME|")" "$1" && touch "$file"
213
+ if ! ssh -G "$1" | grep --silent "^user root$" && touch "$file"; then
214
+ ssh-copy-id -i "$(ssh -G "$1" | grep --max-count 1 "^identityfile " | cut -d " " -f2- | sed "s|^~|$HOME|")" "$1" && touch "$file"
214
215
TERM=xterm-256color kitty +kitten ssh -R 2489:127.0.0.1:2489 "$@"
215
- else TERM=xterm-256color ssh "$@"
216
+ return $?
217
+ fi
216
218
fi
219
+ TERM=xterm-256color pass ssh "$@"
217
220
}
218
221
219
222
# Listen to loopback of mic
Original file line number Diff line number Diff line change 122
122
# timg: images
123
123
# timga: potentially viewable as image
124
124
if test " $timg " ; then
125
+ # Don't show info on all images for gifs
125
126
$inspect || $elevate timg $( test " $timga " && echo " -V" ) --rotate=exif -g $( tput cols) x$( expr $( tput lines) / 2) \
126
127
$( test $# -gt 1 && grid=$( expr $( tput cols) / \( 30 - $# \& $# \< 25 \| 5 \) ) &&
127
128
echo " -t0.2 --center $( test $# -lt 30 && echo " --title" ) --grid=$(( grid < $# ? grid : $# )) x2" ) \
Original file line number Diff line number Diff line change @@ -13,5 +13,5 @@ case "$1" in
13
13
(lab) host=git@gitlab.com;;
14
14
(* ) host=$1 ;;
15
15
esac
16
- echo " ${host:- git.jfischer.org} :${3:- ${user:- $(git config user.name)} } /${2:- $(basename $PWD )} .git" ;;
16
+ echo " ${host:- gitea @ git.jfischer.org} :${3:- ${user:- $(git config user.name)} } /${2:- $(basename $PWD )} .git" ;;
17
17
esac
Original file line number Diff line number Diff line change @@ -7,10 +7,11 @@ PLAYLISTS="$MUSIC/Playlists"
7
7
LINKS=" $MUSIC /links"
8
8
if test " $1 " = " -r"
9
9
then shift
10
- test " $1 " = " -v" && verbose=-v && shift
10
+ test " $1 " = " -v" && verbose=-v && set -x && shift
11
+ # TODO this is sooo slow...
11
12
for arg
12
13
do filepath=" $( { find " $( dirname -- " $arg " ) " -maxdepth 1 -name " $( basename -- " $arg " ) *" -exec realpath {} + ||
13
- arg-test find " $MUSIC /$( dirname -- " $arg " ) " " $MUSIC /Playlists/$( dirname -- " $arg " ) " -maxdepth 1 \
14
+ find " $MUSIC /$( dirname -- " $arg " ) " " $MUSIC /Playlists/$( dirname -- " $arg " ) " -maxdepth 1 \
14
15
-name " $( basename -- " $arg " ) *" -exec realpath {} +; } 2> /dev/null) "
15
16
test -n " $verbose " && echo " Scanning path '$filepath ' $(
16
17
test " $arg " ! = " $filepath " && echo " from '$arg ' " ) (MUSIC: '$MUSIC ', PWD: '$PWD ')" >&2
You can’t perform that action at this time.
0 commit comments