From: Sergey Matveev <stargrave@stargrave.org>
Date: Fri, 28 Jan 2022 08:26:13 +0000 (+0300)
Subject: Less /bin/-hardcoded paths
X-Git-Tag: v1.23.0~9
X-Git-Url: http://www.git.cypherpunks.ru/?p=goredo.git;a=commitdiff_plain;h=e7ec5ed77e56fe83ce549c0d7a182d3830653b2e

Less /bin/-hardcoded paths
---

diff --git a/t/apenwarr/105-sympath/all.do b/t/apenwarr/105-sympath/all.do
index 7def58d..bb8a16a 100644
--- a/t/apenwarr/105-sympath/all.do
+++ b/t/apenwarr/105-sympath/all.do
@@ -11,12 +11,13 @@ for iter in 10 20; do
 	(
 		cd y/x/x/x/x/x
 		IFS=$(printf '\n')
+		_pwd=$(env pwd)
 		redo-ifchange static x/x/x/static $PWD/static \
-			$(/bin/pwd)/static /etc/passwd
+			$_pwd/static /etc/passwd
 		# goredo: that symlink path is not resolving even at OS level
 		# redo-ifchange $PWD/../static 2>/dev/null && exit 35
 		redo-ifchange 1.dyn x/x/x/2.dyn $PWD/3.dyn \
-			 $PWD/../4.dyn $(/bin/pwd)/5.dyn
+			 $PWD/../4.dyn $_pwd/5.dyn
 	)
 	[ -e y/1.dyn ] || exit $((iter + 1))
 	[ -e y/2.dyn ] || exit $((iter + 2))
diff --git a/t/apenwarr/all.do b/t/apenwarr/all.do
index 362d319..06a9d54 100644
--- a/t/apenwarr/all.do
+++ b/t/apenwarr/all.do
@@ -5,5 +5,5 @@ if [ "$(cat 000-set-minus-e/log)" != "ok" ]; then
     exit 5
 fi
 
-/bin/ls 1[0-9][0-9]*/all.do | sed 's/\.do$//' | xargs redo
+env ls 1[0-9][0-9]*/all.do | sed 's/\.do$//' | xargs redo
 110-compile/hello >&2
diff --git a/t/apenwarr/clean.do b/t/apenwarr/clean.do
index ee6ed2b..ecc7e74 100644
--- a/t/apenwarr/clean.do
+++ b/t/apenwarr/clean.do
@@ -1,3 +1 @@
-/bin/ls [0-9s][0-9][0-9]*/clean.do |
-sed 's/\.do$//' |
-xargs redo
+env ls [0-9s][0-9][0-9]*/clean.do | sed 's/\.do$//' | xargs redo