bug fix

diff --git a/lace b/lace
index 3929cacc98c13fcc95bcaed2f4d890a7262fe2e8..bf89aeb6c87d4156a0d61ec8cc12d6c1a6e481b9 100755 (executable)
--- a/lace
+++ b/lace
@@ -97,12 +97,13 @@ function timeline() {
                                user="$fav $user"
                        fi
                        timeout $connectto openssl s_client -crlf -quiet -connect "$domain:1965" <<<"$url" 2>/dev/null > $tmpfile3
                                user="$fav $user"
                        fi
                        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}'  )
+               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
                        if [[ $newuser != "" ]]
                        then

-                               
-                       user="$newavatar $newuser"
+       newuser=$(echo "$newuser" | xargs)
+       newavatar=$(echo "$newavatar" | xargs)
+               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
                        fi
 
                        cat $tmpfile3 | sed -e '1d' | sed -n '/##/,$p' | sed -e "s/^\(## .*\)$/\1\n${esc}$red$user${esc}$nc ($domain)/g" >> $tmpfile

diff --git a/laced b/laced
index 3a855f52cdd3915fb3fa56f51a64a2dba21bf4fc..debf5475ba4fc2021a78a894bc5b455ea8dd69c2 100755 (executable)
--- a/laced
+++ b/laced
@@ -97,12 +97,13 @@ function timeline() {
                                user="$fav $user"
                        fi
                        timeout $connectto openssl s_client -crlf -quiet -connect "$domain:1965" <<<"$url" 2>/dev/null > $tmpfile3
                                user="$fav $user"
                        fi
                        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}'  )
+               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
                        if [[ $newuser != "" ]]
                        then

-                               
-                       user="$newavatar $newuser"
+       newuser=$(echo "$newuser" | xargs)
+       newavatar=$(echo "$newavatar" | xargs)
+               user="$newavatar $newuser"

                        fi
 
 
                        fi