dotfiles

commit 2bc9ea6237cbdda42409b90e9f97fa97d74ebe7a
parent b03254d19baafe78392b4a93fde6d822eaafe557
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date:   Sat, 29 Dec 2018 09:16:23 +0100

Use torsocks instead of torify

Diffstat:
M
links/bin/currency
 | 
4
++--
M
links/bin/tor-browser-update.sh
 | 
8
++++----
M
links/bin/tpb
 | 
2
+-
M
links/bin/youtube-dl-music.sh
 | 
4
++--

4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/links/bin/currency b/links/bin/currency
@@ -24,8 +24,8 @@ CONVERTER="http://free.currencyconverterapi.com/api/v3/convert?q=${FROM}_${TO}&c
 #echo $CONVERTER
 
 GETCMD="wget --no-verbose"
-#if command -v torify >/dev/null 2>/dev/null; then
-#    GETCMD="torify $GETCMD"
+#if command -v torsocks >/dev/null 2>/dev/null; then
+#    GETCMD="torsocks $GETCMD"
 #fi
 
 # google finance
diff --git a/links/bin/tor-browser-update.sh b/links/bin/tor-browser-update.sh
@@ -5,7 +5,7 @@ set -e
 
 # Gets latest Tor Browser Bundle (TBB) stable version for Linux x86_64,
 # downloads it, verifies it, and extracts it.
-# The scripts downloads the files using "torify", if available.
+# The scripts downloads the files using "torsocks", if available.
 
 # Folder where to download and extract the archives
 TORFOLDER=~/tor
@@ -34,11 +34,11 @@ else
     exit 1
 fi
 
-# Check if torify is installed
+# Check if torsocks is installed
 GETCMD="wget --no-verbose"
-if command -v torify 2>/dev/null; then
+if command -v torsocks 2>/dev/null; then
     TORIFY="yes"
-    DOWNLOADCMD="torify $GETCMD"
+    DOWNLOADCMD="torsocks $GETCMD"
 else
     DOWNLOADCMD=$GETCMD
 fi
diff --git a/links/bin/tpb b/links/bin/tpb
@@ -91,7 +91,7 @@ fi
 
 # get results
 # Here be dragons!
-r=`torify curl -k -A Mozilla -b "lw=s" -m 15 -s "$TPB/$url" \
+r=`torsocks curl -k -A Mozilla -b "lw=s" -m 15 -s "$TPB/$url" \
 	| grep -Eo '^<td><a href=\"/torrent/[^>]*>.*|^<td><nobr><a href=\"[^"]*|<td align=\"right\">[^<]*' \
 	| sed  's!^<td><a href=\"/torrent/[^>]*>!!; \
 		s!</a>$!!; \
diff --git a/links/bin/youtube-dl-music.sh b/links/bin/youtube-dl-music.sh
@@ -2,12 +2,12 @@
 set -e
 set -u
 
-read -p "torify? [Y/n] " -n 1 -r
+read -p "use torsocks? [Y/n] " -n 1 -r
 echo
 if [[ $REPLY =~ ^[Nn]$ ]]; then
     prefix=""
 else
-    prefix="torify"
+    prefix="torsocks"
 fi
 
 oldpwd=$PWD