Merge pull request #84 from mwoehlke-kitware/fix-wrapper-scripts

Avoid use of BASH_SOURCE in wrapper scripts
lcm-proj · Jul 13, 2016 · 33fc57b · 33fc57b
2 parents 0af6d04 + 59c7d05
commit 33fc57b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lcm-java/lcm-logplayer-gui.sh b/lcm-java/lcm-logplayer-gui.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
-if [ -n "$(type -p perl)" ]
-  then mydir="$(dirname "$(perl -MCwd -le 'print Cwd::abs_path(shift)' "${BASH_SOURCE[0]}")")"
-  else mydir="$(dirname "${BASH_SOURCE[0]}")"
+if (perl -e '' 2>/dev/null)
+  then mydir="$(dirname "$(perl -MCwd -le 'print Cwd::abs_path(shift)' "$0")")"
+  else mydir="$(dirname "$0")"
 fi
 if [ -e "$mydir/lcm.jar" ]
   then jardir="$mydir"

diff --git a/lcm-java/lcm-spy.sh b/lcm-java/lcm-spy.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
-if [ -n "$(type -p perl)" ]
-  then mydir="$(dirname "$(perl -MCwd -le 'print Cwd::abs_path(shift)' "${BASH_SOURCE[0]}")")"
-  else mydir="$(dirname "${BASH_SOURCE[0]}")"
+if (perl -e '' 2>/dev/null)
+  then mydir="$(dirname "$(perl -MCwd -le 'print Cwd::abs_path(shift)' "$0")")"
+  else mydir="$(dirname "$0")"
 fi
 if [ -e "$mydir/lcm.jar" ]
   then jardir="$mydir"