projects
/
lace
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
88aaf1c
)
updated lace with timeout
author
frrobert2 <frrobert@stnectarios.org>
Tue, 27 Apr 2021 18:31:34 +0000
(14:31 -0400)
committer
frrobert2 <frrobert@stnectarios.org>
Tue, 27 Apr 2021 18:31:34 +0000
(14:31 -0400)
lace
patch
|
blob
|
history
diff --git
a/lace
b/lace
index 3a92438cf7dbaf2395e5cb103719061bb86423fc..8ac47c12de881656db410b01b91751fe2f5dcf32 100755
(executable)
--- a/
lace
+++ b/
lace
@@
-4,9
+4,9
@@
# https://raw.githubusercontent.com/frrobert2/lace/main/lace
# Shows both how many days ago and date
# Modified to work with Debian running Sed 3.7
# https://raw.githubusercontent.com/frrobert2/lace/main/lace
# Shows both how many days ago and date
# Modified to work with Debian running Sed 3.7
+connectto=30
if [ -z "$XDG_CONFIG_HOME" ];then
config_place="$HOME/.config/lace"
if [ -z "$XDG_CONFIG_HOME" ];then
config_place="$HOME/.config/lace"
-[[ ! -d "$HOME/.config" ]] && mkdir -p "$HOME/.config"
else
config_place="$XDG_CONFIG_HOME/lace"
fi
else
config_place="$XDG_CONFIG_HOME/lace"
fi
@@
-17,14
+17,8
@@
red="[31m"
blue="[34m"
nc="[m"
esc=$(echo -e "\033")
blue="[34m"
nc="[m"
esc=$(echo -e "\033")
-if [ ! -d "/tmp" ];then
-[[ ! -d "$HOME/.tmp" ]] && mkdir -p "$HOME/.tmp"
-tmpfile=$(mktemp ~/.tmp/lace.XXXXXX)
-tmpfile2=$(mktemp ~/.tmp/lace.XXXXXX)
-else
tmpfile=$(mktemp /tmp/lace.XXXXXX)
tmpfile2=$(mktemp /tmp/lace.XXXXXX)
tmpfile=$(mktemp /tmp/lace.XXXXXX)
tmpfile2=$(mktemp /tmp/lace.XXXXXX)
-fi
function reldate() {
# stolen from https://unix.stackexchange.com/a/451216
local SEC_PER_MINUTE=$((60))
function reldate() {
# stolen from https://unix.stackexchange.com/a/451216
local SEC_PER_MINUTE=$((60))
@@
-79,43
+73,41
@@
function timeline() {
domain="$url"
url="gemini://$url"
else
domain="$url"
url="gemini://$url"
else
- domain=$(sed 's
#gemini://##
' <<< "$url")
+ domain=$(sed 's
/gemini:\/\///
' <<< "$url")
fi
if [[ "$url" != *.*/*.* ]] && [[ $url != */ ]];then
url="$url/"
fi
fi
if [[ "$url" != *.*/*.* ]] && [[ $url != */ ]];then
url="$url/"
fi
- domain=$(sed 's
#/.*$##
' <<< "$domain")
- fav=$(openssl s_client -crlf -quiet -connect "$domain:1965" <<<"gemini://$domain/favicon.txt" 2>/dev/null | sed -e '1d')
+ 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')
if [ ! -z "$fav" ];then
user="$fav $user"
fi
if [ ! -z "$fav" ];then
user="$fav $user"
fi
- 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 | 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
done <"$subsfile"
[[ ! -z $(sed -n '$p' $tmpfile) ]] && echo "" >> $tmpfile
done <"$subsfile"
-# cat $tmpfile | sed -r ':r;/(^|\n)$/!{$!{N;br}};s/\n/\v/g' | sed -rn '/^## .*/p' | sed -e 's/\v/\n/g' | sed -e "s/^## \(.*\)/date -d '\1' +%s/e" | sed -r ':r;/(^|\n)$/!{$!{N;br}};s/\n/\v/g' | sort -r | sed -e 's/\v/\n/g' > $tmpfile
- cat $tmpfile | sed -r ':r;/(^|\n)$/!{$!{N;br}};s/\n/\v/g' | sed -rn '/^## .*/p' | sed -e 's/\v/\n/g' | sed -e "s/^## \(.*\)/date -d '\1' +%s/e" | sed -r ':r;/(^|\n)$/!{$!{N;br}};s/\n/\v/g' | sort -r | sed -e 's/\v/\n/g' > $tmpfile2
-echo -n "" > $tmpfile
+ cat $tmpfile | sed -r ':r;/(^|\n)$/!{$!{N;br}};s/\n/\v/g' | sed -rn '/^## .*/p' | sed -e 's/\v/\n/g' | sed -e "s/^## \(.*\)/date -d '\1' +%s/e" | sed -r ':r;/(^|\n)$/!{$!{N;br}};s/\n/\v/g' | sort -r | sed -e 's/\v/\n/g' > $tmpfile
+
# removed segment of code | sed "s/^\([0-9]\+\)$/{reldate \1 $now_unix;}/e" | sed "s/^\([0-9]* [a-z]* ago\)$/${esc}$blue\1${esc}$nc/g"
while read line; do
if [[ "$line" =~ ^[0-9]{10,}$ ]]; then
# removed segment of code | sed "s/^\([0-9]\+\)$/{reldate \1 $now_unix;}/e" | sed "s/^\([0-9]* [a-z]* ago\)$/${esc}$blue\1${esc}$nc/g"
while read line; do
if [[ "$line" =~ ^[0-9]{10,}$ ]]; then
- reldate "$line" "$(date +%s)" >> $tmpfile
+ reldate "$line" "$(date +%s)" >> $tmpfile
2
- echo "$(date -d @$line)" >> $tmpfile
+ echo "$(date -d @$line)" >> $tmpfile
2
else
else
- echo "$line" >> $tmpfile
+ echo "$line" >> $tmpfile
2
fi
fi
- done<$tmpfile2
-#
- cat $tmpfile | sed "s/^\([0-9]* [a-z]* ago\)$/${esc}$blue\1${esc}$nc/g" >$tmpfile2
-#
-sed -i -z -e 's/\[m\n/\[m /g' $tmpfile2
+ done<$tmpfile
+
+ cat $tmpfile2 | sed "s/^\([0-9]* [a-z]* ago\)$/${esc}$blue\1${esc}$nc/g" >$tmpfile
+
if [[ "$1" == "nope" ]];then
if [[ "$1" == "nope" ]];then
- cat $tmpfile
2
&& rm -f $tmpfile $tmpfile2
+ cat $tmpfile && rm -f $tmpfile $tmpfile2
else
else
-
less -RisW $tmpfile2
&& rm -f $tmpfile $tmpfile2
+
less -RisW $tmpfile
&& rm -f $tmpfile $tmpfile2
fi
}
fi
}