From 4eeb8039e62caa8516e092e7e49663cefbcebbc5 Mon Sep 17 00:00:00 2001
From: Mike Smith <msmith@techempower.com>
Date: Tue, 25 Mar 2014 10:58:51 -0700
Subject: [PATCH] master Fixed a number of issues with install

---
 nawak/setup.py                      | 11 ++++++++---
 toolset/setup/linux/installer.py    |  6 +++---
 toolset/setup/windows/installer.ps1 |  8 ++++----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/nawak/setup.py b/nawak/setup.py
index 38e49382c39..54d478002f5 100644
--- a/nawak/setup.py
+++ b/nawak/setup.py
@@ -22,7 +22,12 @@ def start(args, logfile, errfile):
   return 0
 
 def stop(logfile, errfile):
-  subprocess.check_call("sudo m2sh stop -every", shell=True, cwd="nawak/conf", stderr=errfile, stdout=logfile)
+  ret = 0
+
+  try:
+    subprocess.check_call("sudo m2sh stop -every", shell=True, cwd="nawak/conf", stderr=errfile, stdout=logfile)
+  except:
+    ret = 1
 
   p = subprocess.Popen(['ps', 'aux'], stdout=subprocess.PIPE)
   out, err = p.communicate()
@@ -32,6 +37,6 @@ def stop(logfile, errfile):
         pid = int(line.split(None, 2)[1])
         os.kill(pid, 15)
       except OSError:
-        pass
+        ret = 1
 
-  return 0
+  return ret
diff --git a/toolset/setup/linux/installer.py b/toolset/setup/linux/installer.py
index 5ab0e2fc40b..08da5d2e839 100644
--- a/toolset/setup/linux/installer.py
+++ b/toolset/setup/linux/installer.py
@@ -190,9 +190,9 @@ def __install_server_software(self):
     #
     self.__download("https://github.com/plt/racket/archive/v5.3.6.tar.gz", "racket-5.3.6.tar.gz")
     self.__run_command("tar xzf racket-5.3.6.tar.gz")
-    self.__run_command("./configure", cwd="racket/src")
-    self.__run_command("make", cwd="racket/src")
-    self.__run_command("sudo make install", cwd="racket/src")
+    self.__run_command("./configure", cwd="racket-5.3.6/src")
+    self.__run_command("make", cwd="racket-5.3.6/src")
+    self.__run_command("sudo make install", cwd="racket-5.3.6/src")
 
     #
     # Ur/Web
diff --git a/toolset/setup/windows/installer.ps1 b/toolset/setup/windows/installer.ps1
index 4d79ee30c24..83d6a31d24d 100644
--- a/toolset/setup/windows/installer.ps1
+++ b/toolset/setup/windows/installer.ps1
@@ -10,9 +10,9 @@ $python_version           = "27"
 $wincache_installer_file  = "wincache-1.3.4-5.4-nts-vc9-x86.exe"
 $wincache_installer_path  = "wincache-1.3.4/$wincache_installer_file"
 $go_installer_file        = "go1.2.windows-amd64.msi"
-$jre_installer_file       = "jre-7u25-windows-x64.exe"
-$jdk_installer_file       = "jdk-7u45-windows-x64.exe"
-$jdk_master_hash          = "943527ed9111cbb746d4ab2bb2c31cd6" 
+$jre_installer_file       = "jre-7u51-windows-x64.exe"
+$jdk_installer_file       = "jdk-7u51-windows-x64.exe"
+$jdk_master_hash          = "d1367410be659f1b47e554e7bd011ea0" 
 # http://www.oracle.com/technetwork/java/javase/downloads/java-se-binaries-checksum-1956892.html
 $resin_version            = "resin-4.0.36"
 $resin_installer_file     = "$resin_version.zip"
@@ -337,4 +337,4 @@ $cygwin_install_dir = "C:\Cygwin"
 Start-Process $cygwin_installer_local "-q -n -l $cygwin_installer_dir -s http://mirrors.kernel.org/sourceware/cygwin/ -R $cygwin_install_dir -P openssh" -WorkingDirectory "$cygwin_installer_dir" -Wait -RedirectStandardOutput $cygwin_installer_dir\install.log
 $env:Path += ";$cygwin_install_dir;$cygwin_install_dir\bin"; [Environment]::SetEnvironmentVariable("Path", $env:Path, [System.EnvironmentVariableTarget]::Machine)
 
-cd $basedir
+cd $basedir
\ No newline at end of file