X-Git-Url: https://software.frrobert.com/lace/blobdiff_plain/492839e7672479ae6974b9484bbdec9c97b298c5..7c6c6abf41f724929802185a43362267a5c90529:/laced diff --git a/laced b/laced index ae8c825..3a855f5 100755 --- a/laced +++ b/laced @@ -29,6 +29,7 @@ esc=$(echo -e "\033") fi tmpfile=$(mktemp /tmp/lace.XXXXXX) tmpfile2=$(mktemp /tmp/lace.XXXXXX) +tmpfile3=$(mktemp /tmp/lace.XXXXXX) function reldate() { # stolen from https://unix.stackexchange.com/a/451216 local SEC_PER_MINUTE=$((60)) @@ -95,7 +96,17 @@ function timeline() { if [ ! -z "$fav" ];then user="$fav $user" fi - timeout $connectto openssl s_client -crlf -quiet -connect "$domain:1965" <<<"$url" 2>/dev/null | sed -e '1d' | sed -n '/##/,$p' | sed -e "s/^\(## .*\)$/\1\n${esc}$red$user${esc}$nc ($domain)/g" >> $tmpfile + timeout $connectto openssl s_client -crlf -quiet -connect "$domain:1965" <<<"$url" 2>/dev/null > $tmpfile3 + local newuser=$(cat $tmpfile3 | sed -n '/# /{n;p;}' | grep -e author | awk '{print $2}' ) + local newavatar=$(cat $tmpfile3 | sed -n '/# /{n;n;p;}' | grep -e avatar | awk '{print $2}' ) + if [[ $newuser != "" ]] + then + + user="$newavatar $newuser" + fi + + + cat $tmpfile3 | sed -e '1d' | sed -n '/##/,$p' | sed -e "s/^\(## .*\)$/\1\n${esc}$red$user${esc}$nc ($domain)/g" >> $tmpfile [[ ! -z $(sed -n '$p' $tmpfile) ]] && echo "" >> $tmpfile fi done <"$subsfile" @@ -125,7 +136,7 @@ sed -i '1i Laced could not connect to the Internet showing previous download' $c fi - rm -f $tmpfile $tmpfile2 + rm -f $tmpfile $tmpfile2 $tmpfile3 } if [[ "$1" == "help" ]] || [[ "$1" == "--help" ]] || [[ "$1" == "-help" ]] || [[ "$1" == "-h" ]];then