diff --git a/build.sh b/build.sh
index a381914..09cd706 100755
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,7 @@
 #! /usr/bin/env bash
 set -e 
 
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
 cd "$SCRIPT_DIR" || exit 1
 
 . i2pversion
diff --git a/clean.sh b/clean.sh
index 9e16d66..f6a9a23 100755
--- a/clean.sh
+++ b/clean.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
 cd "$SCRIPT_DIR" || exit 1
 
 cd ../i2p.i2p.jpackage-build/
diff --git a/daily.sh b/daily.sh
index ee581ac..ae08d76 100755
--- a/daily.sh
+++ b/daily.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
 cd "$SCRIPT_DIR" || exit 1
 
 ### How to set up this script:
diff --git a/release.sh b/release.sh
index 57f49dc..ac93c82 100755
--- a/release.sh
+++ b/release.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
 cd "$SCRIPT_DIR" || exit 1
 
 ./unsigned.sh
diff --git a/sign.sh b/sign.sh
index fc1a6ee..eddc475 100755
--- a/sign.sh
+++ b/sign.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
 cd "$SCRIPT_DIR" || exit 1
 
 . i2pversion
diff --git a/unsigned.sh b/unsigned.sh
index 4a5d7da..49b111e 100755
--- a/unsigned.sh
+++ b/unsigned.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
 cd "$SCRIPT_DIR" || exit 1
 
 ./clean.sh