From 138a710e56c5a4399d45dac78ac40bf7d0047955 Mon Sep 17 00:00:00 2001 From: frrobert2 Date: Thu, 10 Jun 2021 16:42:03 -0400 Subject: [PATCH] will not look for favicon by default --- lace | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lace b/lace index bf89aeb..57c6663 100755 --- a/lace +++ b/lace @@ -90,20 +90,22 @@ function timeline() { url="$url/" fi domain=$(sed 's/\/.*$//' <<< "$domain") - fav=$(timeout $connectto openssl s_client -crlf -quiet -connect "$domain:1965" <<<"gemini://$domain/favicon.txt" 2>/dev/null | sed -e '1d') + timeout $connectto openssl s_client -crlf -quiet -connect "$domain:1965" <<<"$url" 2>/dev/null > $tmpfile3 timeoutstatus=${PIPESTATUS[0]} if [ $timeoutstatus -ne 124 ];then - if [ ! -z "$fav" ];then - user="$fav $user" - fi - timeout $connectto openssl s_client -crlf -quiet -connect "$domain:1965" <<<"$url" 2>/dev/null > $tmpfile3 - local newuser=$(cat $tmpfile3 | grep -m 1 author: | awk -F ":" '{print $2}' ) + local newuser=$(cat $tmpfile3 | grep -m 1 author: | awk -F ":" '{print $2}' ) local newavatar=$(cat $tmpfile3 | grep -m 1 avatar: | awk -F ":" '{print $2}' ) if [[ $newuser != "" ]] then newuser=$(echo "$newuser" | xargs) newavatar=$(echo "$newavatar" | xargs) user="$newavatar $newuser" + else + fav=$(timeout $connectto openssl s_client -crlf -quiet -connect "$domain:1965" <<<"gemini://$domain/favicon.txt" 2>/dev/null | sed -e '1d') +if [ ! -z "$fav" ];then + user="$fav $user" + fi + fi cat $tmpfile3 | sed -e '1d' | sed -n '/##/,$p' | sed -e "s/^\(## .*\)$/\1\n${esc}$red$user${esc}$nc ($domain)/g" >> $tmpfile -- 1.8.3.1