tor

commit 67bfb87dcbbdd7808446dc452f028b857701f2fc
parent 2c5c752fd2d671520789afb9f5cff6eb794c21c4
Author: David Goulet <dgoulet@torproject.org>
Date:   Mon, 14 Aug 2023 15:09:09 +0000

Merge branch 'main' into 'main'

Clean up torify

See merge request tpo/core/tor!740
Diffstat:
M
contrib/client-tools/torify
 | 
19
+------------------

1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/contrib/client-tools/torify b/contrib/client-tools/torify
@@ -37,25 +37,8 @@ case $1 in -v|--verbose)
 	shift
 esac
 
-# taken from Debian's Developer's Reference, 6.4
-pathfind() {
-       OLDIFS="$IFS"
-       IFS=:
-       for p in $PATH; do
-               if [ -x "$p/$*" ]; then
-                       IFS="$OLDIFS"
-                       return 0
-               fi
-       done
-       IFS="$OLDIFS"
-       return 1
-}
-
-if pathfind torsocks; then
+if command -v torsocks > /dev/null; then
     exec torsocks "$@"
-    echo "$0: Failed to exec torsocks $*" >&2
-    exit 1
 else
     echo "$0: torsocks not found in your PATH.  Perhaps it isn't installed?  (tsocks is no longer supported, for security reasons.)" >&2
 fi
-