pwd may not be in /bin, so change /bin/pwd to pwd

For example, pwd is not in /bin in NixOS.

Thanks to Ben Kelly for reporting the issue.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/README.md b/README.md
index ad320dffa125f1b3be55d3e850fd844cb2bd84df..31bb2bfefb79e379d88408b1b9e295c0c5e1f4ff 100644 (file)
--- a/README.md
+++ b/README.md
@@ -152,7 +152,7 @@ From source
     may fail.  Running something like this before "make test" should
     sidestep the problem:
 
-        cd "$(/bin/pwd)"
+        cd "$(pwd -P)"
 
  - You can install bup via "make install", and override the default
    destination with DESTDIR and PREFIX.

diff --git a/t/test-index.sh b/t/test-index.sh
index 31f5408864ff4a83a855bc5b7da21829ae46e533..f714f7319392f4fa10735b57e5624626254b53ea 100755 (executable)
--- a/t/test-index.sh
+++ b/t/test-index.sh
@@ -5,7 +5,7 @@
 
 set -o pipefail
 
-top="$(WVPASS /bin/pwd)" || exit $?
+top="$(WVPASS pwd)" || exit $?
 tmpdir="$(WVPASS wvmktempdir)" || exit $?
 export BUP_DIR="$tmpdir/bup"
 

diff --git a/t/test-split-join.sh b/t/test-split-join.sh
index 5e7cdef973a151098988a517bf99b7b483bace0e..8e3cc4d584a866023de940b6f1eddff2a7e18c9a 100755 (executable)
--- a/t/test-split-join.sh
+++ b/t/test-split-join.sh
@@ -5,7 +5,7 @@
 
 set -o pipefail
 
-top="$(WVPASS /bin/pwd)" || exit $?
+top="$(WVPASS pwd)" || exit $?
 tmpdir="$(WVPASS wvmktempdir)" || exit $?
 export BUP_DIR="$tmpdir/bup"
 

diff --git a/t/test.sh b/t/test.sh
index f82c3452b67e0c2263a0ba29e42f028e0503f78d..943ab60458dcd05c9b2507bb20e8ba8c28107626 100755 (executable)
--- a/t/test.sh
+++ b/t/test.sh
@@ -5,7 +5,7 @@
 
 set -o pipefail
 
-top="$(WVPASS /bin/pwd)" || exit $?
+top="$(WVPASS pwd)" || exit $?
 tmpdir="$(WVPASS wvmktempdir)" || exit $?
 export BUP_DIR="$tmpdir/bup"