Tolerate CDPATH being set

bjornfor · oberpar · commit 41e07cadeeae · 2018-12-10T14:15:38.000+01:00
If CDPATH is set, cd will print the path it enters, resulting in TOOLDIR
containing the path twice, separated by a newline.

Signed-off-by: Bjørn Forsman &lt;bjorn.forsman@gmail.com&gt;
diff --git a/bin/get_changes.sh b/bin/get_changes.sh
@@ -4,7 +4,7 @@
 #
 # Print lcov change log information as provided by Git
 
-TOOLDIR=$(cd $(dirname $0) ; pwd)
+TOOLDIR=$(cd $(dirname $0) >/dev/null ; pwd)
 
 cd $TOOLDIR
 
diff --git a/bin/get_version.sh b/bin/get_version.sh
@@ -5,7 +5,7 @@
 # Print lcov version or release information as provided by Git, .version
 # or a fallback.
 
-TOOLDIR=$(cd $(dirname $0) ; pwd)
+TOOLDIR=$(cd $(dirname $0) >/dev/null ; pwd)
 GITVER=$(cd $TOOLDIR ; git describe --tags 2>/dev/null)
 
 if [ -z "$GITVER" ] ; then

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# Print lcov change log information as provided by Git`
`6`	`6`
`7`		`-TOOLDIR=$(cd $(dirname $0) ; pwd)`
	`7`	`+TOOLDIR=$(cd $(dirname $0) >/dev/null ; pwd)`
`8`	`8`
`9`	`9`	`cd $TOOLDIR`
`10`	`10`