commit 9ae2f8a2293f7e2935b54f51b619ddafd716b070 parent 3d63d713ea42d1ed1ca4686340cd03f82ba394b7 Author: наб <nabijaczleweli@nabijaczleweli.xyz> Date: Wed, 9 Aug 2023 00:28:59 +0200 Clean up torify Replace pathfind() which tries to parse $PATH manually with command -v. exec is always fatal, regardless of if it managed to execute. 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 -