Avoid hardcoding of /usr/bin or /usr/pkg/bin - gophercgis - Collection of gopher CGI/DCGI for geomyidae
(HTM) hg clone https://bitbucket.org/iamleot/gophercgis
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) changeset dd58bb62f94152b47c38a9a9dac24100afa19909
(DIR) parent adc8f31b94cd9687bb34064ed7395a054cb592e7
(HTM) Author: Leonardo Taccari <iamleot@gmail.com>
Date: Wed, 5 Dec 2018 00:07:20
Avoid hardcoding of /usr/bin or /usr/pkg/bin
This is now handled via PATH in common/config.sh and no longer
needed.
Diffstat:
acmqueue/article.cgi | 2 +-
acmqueue/feed.dcgi | 2 +-
ansa/article.cgi | 2 +-
ansa/feed.dcgi | 2 +-
bandcamp/album.dcgi | 4 ++--
bandcamp/music.dcgi | 6 +++---
common/feed.sh | 6 +++---
common/html.sh | 2 +-
espresso/article.cgi | 2 +-
espresso/feed.dcgi | 2 +-
feeds/feed.dcgi | 2 +-
github/commits.dcgi | 4 ++--
github/issue.dcgi | 8 ++++----
github/issues.dcgi | 4 ++--
github/pull.dcgi | 8 ++++----
github/pulls.dcgi | 4 ++--
github/repo.dcgi | 4 ++--
instagram/comments.cgi | 4 ++--
instagram/user.dcgi | 6 +++---
internazionale/article.cgi | 2 +-
internazionale/sections.dcgi | 4 ++--
lobsters/comments.dcgi | 8 ++++----
lobsters/lobsters.dcgi | 4 ++--
lwn/article.cgi | 2 +-
lwn/feed.dcgi | 2 +-
netbsd/req.dcgi | 2 +-
netbsd/ticket.cgi | 2 +-
raiplay/categoria.dcgi | 4 ++--
raiplay/elenco-programmi.dcgi | 4 ++--
raiplay/genere.dcgi | 4 ++--
raiplay/programma.dcgi | 4 ++--
reddit/c.cgi | 4 ++--
reddit/r.dcgi | 4 ++--
rep/article.cgi | 2 +-
rep/rep.dcgi | 4 ++--
technologyreview/article.cgi | 4 ++--
technologyreview/feed.dcgi | 2 +-
theatlantic/article.cgi | 4 ++--
theatlantic/feed.dcgi | 2 +-
theguardian/article.cgi | 2 +-
theguardian/feed.dcgi | 2 +-
twitter/tweets.dcgi | 2 +-
youtube/channel.dcgi | 2 +-
youtube/search.dcgi | 2 +-
44 files changed, 76 insertions(+), 76 deletions(-)
---
diff -r adc8f31b94cd -r dd58bb62f941 acmqueue/article.cgi
--- a/acmqueue/article.cgi Tue Dec 04 23:58:41 2018 +0100
+++ b/acmqueue/article.cgi Wed Dec 05 00:07:20 2018 +0100
@@ -3,7 +3,7 @@
. ../common/html.sh
url=$2
-/usr/pkg/bin/curl -Lgs -- "${url}" |
+curl -Lgs -- "${url}" |
sed -ne '/^<h1 class="hidetitle">/p' |
html_to_text
diff -r adc8f31b94cd -r dd58bb62f941 acmqueue/feed.dcgi
--- a/acmqueue/feed.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/acmqueue/feed.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -12,5 +12,5 @@
echo ""
url="https://queue.acm.org/rss/feeds/queuecontent.xml"
-/usr/pkg/bin/curl -Lgs -- "${url}" |
+curl -Lgs -- "${url}" |
feed_to_gph
diff -r adc8f31b94cd -r dd58bb62f941 ansa/article.cgi
--- a/ansa/article.cgi Tue Dec 04 23:58:41 2018 +0100
+++ b/ansa/article.cgi Wed Dec 05 00:07:20 2018 +0100
@@ -36,7 +36,7 @@
url=$2
-/usr/pkg/bin/curl -Lgs -- "${url}" |
+curl -Lgs -- "${url}" |
extract_article |
filter_html |
html_to_text
diff -r adc8f31b94cd -r dd58bb62f941 ansa/feed.dcgi
--- a/ansa/feed.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/ansa/feed.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -12,5 +12,5 @@
echo ""
url="http://www.ansa.it/sito/ansait_rss.xml"
-/usr/pkg/bin/curl -Lgs -- "${url}" |
+curl -Lgs -- "${url}" |
feed_to_gph
diff -r adc8f31b94cd -r dd58bb62f941 bandcamp/album.dcgi
--- a/bandcamp/album.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/bandcamp/album.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -26,9 +26,9 @@
echo "[h|URL|${url}|server|port]"
echo "t"
-/usr/bin/ftp -V -o - "${url}" |
+ftp -V -o - "${url}" |
extract_json |
-/usr/pkg/bin/jq -r '
+jq -r '
.[] |
"[h|" + (.track_num | tostring) + " - " + (.title | gsub("\\|"; "\\|")) + "|" +
"URL:\(.file."mp3-128" | gsub("\\|"; "\\|"))" + "|server|port]"
diff -r adc8f31b94cd -r dd58bb62f941 bandcamp/music.dcgi
--- a/bandcamp/music.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/bandcamp/music.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -12,9 +12,9 @@
echo "tBandcamp"
echo "t"
-/usr/bin/ftp -V -o - "${url}/music" |
-{ /usr/pkg/bin/xmllint --html --xpath 'string(//ol/@data-initial-values)' - 2>/dev/null ; } |
-/usr/pkg/bin/jq -r '
+ftp -V -o - "${url}/music" |
+{ xmllint --html --xpath 'string(//ol/@data-initial-values)' - 2>/dev/null ; } |
+jq -r '
.[] |
"[1|\((.title + " - " + .band_name) | gsub("\\|"; "\\|"))|" +
"'"${ALBUM_CGI}?${url}"'\(.page_url | gsub("\\|"; "\\|"))|server|port]",
diff -r adc8f31b94cd -r dd58bb62f941 common/feed.sh
--- a/common/feed.sh Tue Dec 04 23:58:41 2018 +0100
+++ b/common/feed.sh Wed Dec 05 00:07:20 2018 +0100
@@ -7,7 +7,7 @@
feed_to_gph()
{
- /usr/pkg/bin/sfeed |
+ sfeed |
awk -v feed_author="${FEED_AUTHOR}" \
-v feed_date="${FEED_DATE}" \
-v feed_content="${FEED_CONTENT}" \
@@ -26,9 +26,9 @@
cmd = cmd " LANG=en_US.UTF-8"
if (c_type == "html") {
- cmd = cmd " /usr/pkg/bin/w3m -T text/html"
+ cmd = cmd " w3m -T text/html"
} else {
- cmd = cmd " /usr/pkg/bin/w3m -T text/plain"
+ cmd = cmd " w3m -T text/plain"
}
cmd = cmd " -config /dev/null"
cmd = cmd " -dump -no-cookie -cols 72"
diff -r adc8f31b94cd -r dd58bb62f941 common/html.sh
--- a/common/html.sh Tue Dec 04 23:58:41 2018 +0100
+++ b/common/html.sh Wed Dec 05 00:07:20 2018 +0100
@@ -9,7 +9,7 @@
# Nonexistent proxy to block HTTP requests
export http_proxy="http://localhost:31283128"
- browser="/usr/pkg/bin/w3m"
+ browser="w3m"
browser_options="-dump -T text/html -no-cookie -cols 72"
browser_options="${browser_options} -o display_link=false"
diff -r adc8f31b94cd -r dd58bb62f941 espresso/article.cgi
--- a/espresso/article.cgi Tue Dec 04 23:58:41 2018 +0100
+++ b/espresso/article.cgi Wed Dec 05 00:07:20 2018 +0100
@@ -21,7 +21,7 @@
url="$2"
-/usr/pkg/bin/curl -Lgs -- "${url}" |
+curl -Lgs -- "${url}" |
extract_article |
html_to_text
diff -r adc8f31b94cd -r dd58bb62f941 espresso/feed.dcgi
--- a/espresso/feed.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/espresso/feed.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -12,5 +12,5 @@
echo ""
url="http://espresso.repubblica.it/rss?sezione=espresso"
-/usr/pkg/bin/curl -Lgs -- "${url}" |
+curl -Lgs -- "${url}" |
feed_to_gph
diff -r adc8f31b94cd -r dd58bb62f941 feeds/feed.dcgi
--- a/feeds/feed.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/feeds/feed.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -8,5 +8,5 @@
FEED_DATE=yes
url="$2"
-/usr/pkg/bin/curl -Lgs -- "${url}" |
+curl -Lgs -- "${url}" |
feed_to_gph
diff -r adc8f31b94cd -r dd58bb62f941 github/commits.dcgi
--- a/github/commits.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/github/commits.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -21,8 +21,8 @@
url="https://api.github.com/repos/${owner}/${repo}/commits"
-/usr/pkg/bin/curl -Lgs -- "${url}" |
- /usr/pkg/bin/jq -r '
+curl -Lgs -- "${url}" |
+ jq -r '
"t",
"tGitHub - '"${owner}/${repo}"' commits",
"t",
diff -r adc8f31b94cd -r dd58bb62f941 github/issue.dcgi
--- a/github/issue.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/github/issue.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -23,8 +23,8 @@
url="https://api.github.com/repos/${owner}/${repo}/issues/${issue}"
-/usr/pkg/bin/curl -Lgs -- "${url}" |
- /usr/pkg/bin/jq -r '
+curl -Lgs -- "${url}" |
+ jq -r '
"",
"GitHub - '"${owner}/${repo}"' issue #'"${issue}"'",
"",
@@ -36,8 +36,8 @@
' | expand | sed -e '/^\[[0137Ighi]\|/n' -e 's/^/t/'
url="https://api.github.com/repos/${owner}/${repo}/issues/${issue}/comments"
-/usr/pkg/bin/curl -s "${url}" |
- /usr/pkg/bin/jq -r '
+curl -s "${url}" |
+ jq -r '
.[] |
"@\(.user.login) writes:",
"\(.body)",
diff -r adc8f31b94cd -r dd58bb62f941 github/issues.dcgi
--- a/github/issues.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/github/issues.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -20,8 +20,8 @@
url="https://api.github.com/repos/${owner}/${repo}/issues"
-/usr/pkg/bin/curl -Lgs -- "${url}" |
- /usr/pkg/bin/jq -r '
+curl -Lgs -- "${url}" |
+ jq -r '
"t",
"tGitHub - '"${owner}/${repo}"' issues",
"t",
diff -r adc8f31b94cd -r dd58bb62f941 github/pull.dcgi
--- a/github/pull.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/github/pull.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -24,8 +24,8 @@
url="https://api.github.com/repos/${owner}/${repo}/pulls/${pull}"
-/usr/pkg/bin/curl -Lgs -- "${url}" |
- /usr/pkg/bin/jq -r '
+curl -Lgs -- "${url}" |
+ jq -r '
"",
"GitHub - '"${owner}/${repo}"' pull request #'"${pull}"'",
"",
@@ -38,8 +38,8 @@
' | expand | sed -e '/^\[[0137Ighi]\|/n' -e 's/^/t/'
url="https://api.github.com/repos/${owner}/${repo}/pulls/${pull}/comments"
-/usr/pkg/bin/curl -s "${url}" |
- /usr/pkg/bin/jq -r '
+curl -s "${url}" |
+ jq -r '
.[] |
"@\(.user.login) writes:",
"\(.body)",
diff -r adc8f31b94cd -r dd58bb62f941 github/pulls.dcgi
--- a/github/pulls.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/github/pulls.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -21,8 +21,8 @@
url="https://api.github.com/repos/${owner}/${repo}/pulls"
-/usr/pkg/bin/curl -Lgs -- "${url}" |
- /usr/pkg/bin/jq -r '
+curl -Lgs -- "${url}" |
+ jq -r '
"t",
"tGitHub - '"${owner}/${repo}"' pull requests",
"t",
diff -r adc8f31b94cd -r dd58bb62f941 github/repo.dcgi
--- a/github/repo.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/github/repo.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -20,8 +20,8 @@
url="https://api.github.com/repos/${owner}/${repo}"
-/usr/pkg/bin/curl -Lgs -- "${url}" |
- /usr/pkg/bin/jq -r '
+curl -Lgs -- "${url}" |
+ jq -r '
"t",
"tGitHub - \(.full_name)",
"t",
diff -r adc8f31b94cd -r dd58bb62f941 instagram/comments.cgi
--- a/instagram/comments.cgi Tue Dec 04 23:58:41 2018 +0100
+++ b/instagram/comments.cgi Wed Dec 05 00:07:20 2018 +0100
@@ -7,9 +7,9 @@
media="$2"
-/usr/bin/ftp -V -o - "https://www.instagram.com/p/${media}/" |
+ftp -V -o - "https://www.instagram.com/p/${media}/" |
sed -ne 's/;<\/script>$//' -e '/sharedData =/s/^.*sharedData = //p' |
-/usr/pkg/bin/jq -r '
+jq -r '
.entry_data.PostPage[].graphql.shortcode_media |
.edge_media_to_comment | .edges[] |
( "@\(.node.owner.username) writes:",
diff -r adc8f31b94cd -r dd58bb62f941 instagram/user.dcgi
--- a/instagram/user.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/instagram/user.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -84,20 +84,20 @@
gis=$(printf "%s" "${rhx_gis}:${variables}" | md5 -q)
fetch_cmd() {
- /usr/pkg/bin/curl -H "X-Instagram-GIS: ${gis}" -Lgs -- "${url}"
+ curl -H "X-Instagram-GIS: ${gis}" -Lgs -- "${url}"
}
else
header="${profile_header}"
footer="${profile_footer}"
url="https://www.instagram.com/${user}/"
fetch_cmd() {
- /usr/pkg/bin/curl -Lgs -- "${url}" |
+ curl -Lgs -- "${url}" |
sed -ne 's/;<\/script>$//' -e '/sharedData =/s/^.*sharedData = //p'
}
fi
fetch_cmd |
-/usr/pkg/bin/jq -r '
+jq -r '
(
'"${header}"'
( .edge_owner_to_timeline_media.edges[] | .node |
diff -r adc8f31b94cd -r dd58bb62f941 internazionale/article.cgi
--- a/internazionale/article.cgi Tue Dec 04 23:58:41 2018 +0100
+++ b/internazionale/article.cgi Wed Dec 05 00:07:20 2018 +0100
@@ -54,7 +54,7 @@
url=$2
-/usr/pkg/bin/curl -Lgs -- "${url}" |
+curl -Lgs -- "${url}" |
extract_article |
filter_html |
html_to_text
diff -r adc8f31b94cd -r dd58bb62f941 internazionale/sections.dcgi
--- a/internazionale/sections.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/internazionale/sections.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -26,8 +26,8 @@
echo ""
url="https://data.internazionale.it/stream_data/items/${section}/0/0/${date}.json"
-/usr/bin/ftp -V -o - "${url}" |
-/usr/pkg/bin/jq -r '
+ftp -V -o - "${url}" |
+jq -r '
( .items[] | (
"[0|" +
"\(.title | gsub("\\|"; "\\|") )" + "|" +
diff -r adc8f31b94cd -r dd58bb62f941 lobsters/comments.dcgi
--- a/lobsters/comments.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/lobsters/comments.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -4,8 +4,8 @@
short_id="$2"
-/usr/bin/ftp -V -o - "https://lobste.rs/s/${short_id}.json" |
-/usr/pkg/bin/jq -r '
+ftp -V -o - "https://lobste.rs/s/${short_id}.json" |
+jq -r '
.title + "\u001c" + .url + "\u001c" + ( .score | tostring ) + "\u001c" +
( .created_at[0:19] + "Z" | sub("T"; " ") | sub("Z"; "") | sub(":[0-9]+$"; "") ) + "\u001c" +
.submitter_user.username + "\u001c" + .description + "\u001e",
@@ -58,7 +58,7 @@
}
function print_title(title, url, score, created_at, username, description) {
- fmt_cmd = "/usr/pkg/bin/par -d 0 -B=. -w 80"
+ fmt_cmd = "par -d 0 -B=. -w 80"
gsub("\\|", "\\|", title)
@@ -75,7 +75,7 @@
}
function print_comment(comment, i) {
- fmt_cmd = "/usr/pkg/bin/par -d 0 -B=. -w 80"
+ fmt_cmd = "par -d 0 -B=. -w 80"
printf("[h|%s|URL:%s|server|port]\n",
comment[i, "username"] " writes:",
comment[i, "url"])
diff -r adc8f31b94cd -r dd58bb62f941 lobsters/lobsters.dcgi
--- a/lobsters/lobsters.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/lobsters/lobsters.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -21,8 +21,8 @@
echo "tLobsters"
echo "t"
-/usr/bin/ftp -V -o - "https://lobste.rs/${page}.json" |
-/usr/pkg/bin/jq -r '
+ftp -V -o - "https://lobste.rs/${page}.json" |
+jq -r '
.[] |
(if .url != "" then
"[h|" + ( .title | gsub("\\|"; "\\|") ) + "|" + "URL:" + .url + "|server|port]"
diff -r adc8f31b94cd -r dd58bb62f941 lwn/article.cgi
--- a/lwn/article.cgi Tue Dec 04 23:58:41 2018 +0100
+++ b/lwn/article.cgi Wed Dec 05 00:07:20 2018 +0100
@@ -39,7 +39,7 @@
url=$2
-/usr/pkg/bin/curl -Lgs -- "${url}" |
+curl -Lgs -- "${url}" |
extract_article |
filter_html |
html_to_text
diff -r adc8f31b94cd -r dd58bb62f941 lwn/feed.dcgi
--- a/lwn/feed.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/lwn/feed.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -31,6 +31,6 @@
echo ""
url="https://lwn.net/headlines/newrss"
-/usr/pkg/bin/curl -Lgs -- "${url}" |
+curl -Lgs -- "${url}" |
feed_to_gph |
filter_entries
diff -r adc8f31b94cd -r dd58bb62f941 netbsd/req.dcgi
--- a/netbsd/req.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/netbsd/req.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -62,5 +62,5 @@
echo ""
url="http://releng.netbsd.org/cgi-bin/req-${branch}.cgi"
-/usr/bin/ftp -V -o - "${url}" |
+ftp -V -o - "${url}" |
filter_table
diff -r adc8f31b94cd -r dd58bb62f941 netbsd/ticket.cgi
--- a/netbsd/ticket.cgi Tue Dec 04 23:58:41 2018 +0100
+++ b/netbsd/ticket.cgi Wed Dec 05 00:07:20 2018 +0100
@@ -20,4 +20,4 @@
esac
url="http://releng.netbsd.org/cgi-bin/req-${branch}.cgi?show=${ticket}"
-/usr/bin/ftp -V -o - "${url}"
+ftp -V -o - "${url}"
diff -r adc8f31b94cd -r dd58bb62f941 raiplay/categoria.dcgi
--- a/raiplay/categoria.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/raiplay/categoria.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -13,8 +13,8 @@
;;
esac
-/usr/pkg/bin/curl -Lgs "${url}" |
-/usr/pkg/bin/jq -r '
+curl -Lgs "${url}" |
+jq -r '
"t",
"t\(.name)",
"t",
diff -r adc8f31b94cd -r dd58bb62f941 raiplay/elenco-programmi.dcgi
--- a/raiplay/elenco-programmi.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/raiplay/elenco-programmi.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -6,8 +6,8 @@
url="https://www.raiplay.it/dl/RaiTV/RaiPlayMobile/Prod/Config/programmiAZ-elenco.json"
-/usr/pkg/bin/curl -gs "${url}" |
-/usr/pkg/bin/jq -r '.[] | .[] | (
+curl -gs "${url}" |
+jq -r '.[] | .[] | (
.name + "\t" +
.tipology + "\t" +
.PLRanno + "\t" +
diff -r adc8f31b94cd -r dd58bb62f941 raiplay/genere.dcgi
--- a/raiplay/genere.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/raiplay/genere.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -13,8 +13,8 @@
;;
esac
-/usr/pkg/bin/curl -Lgs "${url}" |
-/usr/pkg/bin/jq -r '
+curl -Lgs "${url}" |
+jq -r '
"t",
"t\(.name)",
"t",
diff -r adc8f31b94cd -r dd58bb62f941 raiplay/programma.dcgi
--- a/raiplay/programma.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/raiplay/programma.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -13,8 +13,8 @@
;;
esac
-/usr/pkg/bin/curl -Lgs "${url}" |
-/usr/pkg/bin/jq -r '
+curl -Lgs "${url}" |
+jq -r '
"t",
"t\(.Name) \(.channel // "")",
"t",
diff -r adc8f31b94cd -r dd58bb62f941 reddit/c.cgi
--- a/reddit/c.cgi Tue Dec 04 23:58:41 2018 +0100
+++ b/reddit/c.cgi Wed Dec 05 00:07:20 2018 +0100
@@ -10,8 +10,8 @@
ua=""
url="https://www.reddit.com/r/${subreddit}/comments/${id}/.json"
-/usr/pkg/bin/curl -A "${ua}" -Lgs -- "${url}" |
-/usr/pkg/bin/jq -r '
+curl -A "${ua}" -Lgs -- "${url}" |
+jq -r '
( .[0] | .data.children[] | .data |
"",
"\(.subreddit_name_prefixed) - \(.title)",
diff -r adc8f31b94cd -r dd58bb62f941 reddit/r.dcgi
--- a/reddit/r.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/reddit/r.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -23,8 +23,8 @@
echo "tr/${subreddit}"
echo "t"
-/usr/pkg/bin/curl -A "${ua}" -Lgs -- "${url}" |
-/usr/pkg/bin/jq -r '
+curl -A "${ua}" -Lgs -- "${url}" |
+jq -r '
( .data.children[] | .data |
"[h|\(.title | gsub("\\|"; "\\|") )|" +
"URL:\(.url | gsub("\\|"; "\\|"))|server|port]",
diff -r adc8f31b94cd -r dd58bb62f941 rep/article.cgi
--- a/rep/article.cgi Tue Dec 04 23:58:41 2018 +0100
+++ b/rep/article.cgi Wed Dec 05 00:07:20 2018 +0100
@@ -47,7 +47,7 @@
url=$2
-/usr/pkg/bin/curl -Lgs -- "${url}" |
+curl -Lgs -- "${url}" |
extract_article |
filter_html |
html_to_text
diff -r adc8f31b94cd -r dd58bb62f941 rep/rep.dcgi
--- a/rep/rep.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/rep/rep.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -19,8 +19,8 @@
echo "Rep - Repubblica"
echo ""
-/usr/bin/ftp -V -o - "${url}" |
-/usr/pkg/bin/jq -r '.feed.zones | .[].blocks | .[].entries | .[] |
+ftp -V -o - "${url}" |
+jq -r '.feed.zones | .[].blocks | .[].entries | .[] |
.title + "\u001c" +
.author + "\u001c" +
.created[0:10] + "\u001c" +
diff -r adc8f31b94cd -r dd58bb62f941 technologyreview/article.cgi
--- a/technologyreview/article.cgi Tue Dec 04 23:58:41 2018 +0100
+++ b/technologyreview/article.cgi Wed Dec 05 00:07:20 2018 +0100
@@ -61,8 +61,8 @@
;;
esac
-/usr/pkg/bin/curl -Lgs -- "${url}" |
- { /usr/pkg/bin/xmllint --html --format --xpath '//main' - 2>/dev/null ; } |
+curl -Lgs -- "${url}" |
+ { xmllint --html --format --xpath '//main' - 2>/dev/null ; } |
extract_section |
filter_html |
html_to_text
diff -r adc8f31b94cd -r dd58bb62f941 technologyreview/feed.dcgi
--- a/technologyreview/feed.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/technologyreview/feed.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -12,5 +12,5 @@
echo ""
url="https://www.technologyreview.com/stories.rss"
-/usr/pkg/bin/curl -Lgs -- "${url}" |
+curl -Lgs -- "${url}" |
feed_to_gph
diff -r adc8f31b94cd -r dd58bb62f941 theatlantic/article.cgi
--- a/theatlantic/article.cgi Tue Dec 04 23:58:41 2018 +0100
+++ b/theatlantic/article.cgi Wed Dec 05 00:07:20 2018 +0100
@@ -3,8 +3,8 @@
. ../common/html.sh
url=$2
-/usr/pkg/bin/curl -Lgs -- "${url}" |
- { /usr/pkg/bin/xmllint --html --xpath '//article' - 2>/dev/null ; } |
+curl -Lgs -- "${url}" |
+ { xmllint --html --xpath '//article' - 2>/dev/null ; } |
html_to_text
echo ""
diff -r adc8f31b94cd -r dd58bb62f941 theatlantic/feed.dcgi
--- a/theatlantic/feed.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/theatlantic/feed.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -46,5 +46,5 @@
echo ""
url="https://www.theatlantic.com/feed/channel/${section}/"
-/usr/pkg/bin/curl -Lgs -- "${url}" |
+curl -Lgs -- "${url}" |
feed_to_gph
diff -r adc8f31b94cd -r dd58bb62f941 theguardian/article.cgi
--- a/theguardian/article.cgi Tue Dec 04 23:58:41 2018 +0100
+++ b/theguardian/article.cgi Wed Dec 05 00:07:20 2018 +0100
@@ -43,7 +43,7 @@
url=$2
-/usr/pkg/bin/curl -Lgs -- "${url}" |
+curl -Lgs -- "${url}" |
extract_article |
filter_html |
html_to_text
diff -r adc8f31b94cd -r dd58bb62f941 theguardian/feed.dcgi
--- a/theguardian/feed.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/theguardian/feed.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -54,5 +54,5 @@
echo ""
url="https://www.theguardian.com/${section}/rss"
-/usr/pkg/bin/curl -Lgs -- "${url}" |
+curl -Lgs -- "${url}" |
feed_to_gph
diff -r adc8f31b94cd -r dd58bb62f941 twitter/tweets.dcgi
--- a/twitter/tweets.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/twitter/tweets.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -2,4 +2,4 @@
. ../common/config.sh
-CGI="/cgi/twitter/tweets.dcgi" TWEET_USER="$2" PYTHONIOENCODING="utf-8" /usr/pkg/bin/python2.7 tweets.py
+CGI="/cgi/twitter/tweets.dcgi" TWEET_USER="$2" PYTHONIOENCODING="utf-8" python2.7 tweets.py
diff -r adc8f31b94cd -r dd58bb62f941 youtube/channel.dcgi
--- a/youtube/channel.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/youtube/channel.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -8,5 +8,5 @@
FEED_DATE=yes
channel="$2"
-/usr/pkg/bin/curl -Lgs -- "https://www.youtube.com/feeds/videos.xml?channel_id=${channel}" |
+curl -Lgs -- "https://www.youtube.com/feeds/videos.xml?channel_id=${channel}" |
feed_to_gph
diff -r adc8f31b94cd -r dd58bb62f941 youtube/search.dcgi
--- a/youtube/search.dcgi Tue Dec 04 23:58:41 2018 +0100
+++ b/youtube/search.dcgi Wed Dec 05 00:07:20 2018 +0100
@@ -17,7 +17,7 @@
echo "tYouTube"
echo "t"
-/usr/pkg/bin/curl -H 'Accept-Language: en-US' -Lgs -- "${url}" |
+curl -H 'Accept-Language: en-US' -Lgs -- "${url}" |
awk '
/<h3 class="yt-lockup-title ">/ {
if (!match($0, /href="\/watch\?v=[^"]+"/)) {