Fixed some bugs with the tinyos-tools that have crept in due to incompatibilities...

[tinyos-2.x.git] / tools / tinyos / misc / tos-locate-jre

diff --git a/tools/tinyos/misc/tos-locate-jre b/tools/tinyos/misc/tos-locate-jre
index 9bfbe047e9abba39b4a5f5233c5bba2c4faa6f0b..de04978b0a9c4e4e562cf56989044552cea736b4 100755 (executable)
--- a/tools/tinyos/misc/tos-locate-jre
+++ b/tools/tinyos/misc/tos-locate-jre
@@ -38,7 +38,7 @@ pathlocate () {
 case `uname` in
     CYGWIN*)
     # Hopefully this will always work on cygwin with Sun's Java
-    jversion=`regtool -q get '\\HKLM\\SOFTWARE\\JavaSoft\\Java Development Kit\\CurrentVersion'`
+       jversion=`regtool -q -w get '\\HKLM\\SOFTWARE\\JavaSoft\\Java Development Kit\\CurrentVersion'`
     if [ $? != 0 ]; then
        exit 1
     fi
@@ -121,8 +121,10 @@ if [ "$jni" = "yes" ]; then
        arch=`uname -m`
        jnilocate "$jhome/jre/lib/$arch" || \
            jnilocate "$jhome/jre/lib/i386" || \
+           jnilocate "$jhome/jre/lib/amd64" || \
            jnilocate "$jhome/lib/$arch" || \
-           jnilocate "$jhome/lib/i386"
+           jnilocate "$jhome/lib/i386" || \
+           jnilocate "$jhome/lib/amd64"
     fi
 elif [ "$javac" = "yes" ]; then
  if [ `uname` = "Darwin" ]; then