mirror of
https://github.com/thewesker/greptweet.git
synced 2025-12-20 12:11:05 -05:00
fixes #11
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
#!/bin/sh
|
#!/bin/bash
|
||||||
# vim: set ts=4 sw=4
|
# vim: set ts=4 sw=4
|
||||||
|
|
||||||
umask 002
|
umask 002
|
||||||
@@ -81,8 +81,6 @@ then
|
|||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
shortDomains="t.co bit.ly tinyurl.com goo.gl"
|
|
||||||
|
|
||||||
xml sel -t -m "statuses/status" -n -o "text " -v "id" -o "|" -v "created_at" -o "|" -v "normalize-space(text)" \
|
xml sel -t -m "statuses/status" -n -o "text " -v "id" -o "|" -v "created_at" -o "|" -v "normalize-space(text)" \
|
||||||
-m "entities/urls/url" -i "expanded_url != ''" -n -o "url " -v "url" -o " " -v "expanded_url" $temp | {
|
-m "entities/urls/url" -i "expanded_url != ''" -n -o "url " -v "url" -o " " -v "expanded_url" $temp | {
|
||||||
|
|
||||||
@@ -92,13 +90,8 @@ do
|
|||||||
"text") echo "$text"; text="$rest" ;;
|
"text") echo "$text"; text="$rest" ;;
|
||||||
"url")
|
"url")
|
||||||
set -- $(echo $rest)
|
set -- $(echo $rest)
|
||||||
finUrl=$2
|
expandedURL=$(curl "$2" -m5 -s -L -I -o /dev/null -w '%{url_effective}')
|
||||||
domain=$(echo $finUrl | cut -d'/' -f3)
|
text=${text//"$1"/$expandedURL} # BASHism #11
|
||||||
if echo $shortDomains | grep -q $domain # TODO might match greedily, e.g. with t.co
|
|
||||||
then
|
|
||||||
finUrl=$(curl "$finUrl" -s -L -I -o /dev/null -w '%{url_effective}')
|
|
||||||
fi
|
|
||||||
text=$(echo $text | sed s,$1,$finUrl,g)
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|||||||
Reference in New Issue
Block a user