Skip to content

Commit

Permalink
Updated Compat with 1.9.2
Browse files Browse the repository at this point in the history
  • Loading branch information
pmorton committed Aug 24, 2011
1 parent c68a430 commit b4c1b4f
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions ChefInstaller.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
# limitations under the License.
#

!define DevKitURL "http://cloud.github.com/downloads/oneclick/rubyinstaller/DevKit-tdm-32-4.5.1-20101214-1400-sfx.exe"
!define DevKitURL "http://cloud.github.com/downloads/oneclick/rubyinstaller/DevKit-tdm-32-4.5.2-20110712-1620-sfx.exe"
!define DevKitDownload "$Temp\DevKit.exe";
!define RubyURL "http://rubyforge.org/frs/download.php/74298/rubyinstaller-1.9.2-p180.exe";
!define RubyURL "http://rubyforge.org/frs/download.php/75127/rubyinstaller-1.9.2-p290.exe";
!define RubyDownload "$Temp\Ruby.exe"


OutFile "ChefInstaller.exe"

InstallDir "C:\ChefClient"
InstallDir "C:\Chef"

XPStyle On
ShowInstDetails show
Expand All @@ -44,7 +44,7 @@ ReadRegStr $RubyDir HKLM "SOFTWARE\RubyInstaller\MRI\1.9.2" "InstallLocation"
DetailPrint $RubyDir
IfErrors 0 RubyFound
DetailPrint "No existing Ruby installation found"
StrCpy $RubyDir "$INSTDIR\Ruby"
StrCpy $RubyDir "C:\ruby"
StrCpy $InstallRuby 1
Goto RubyInitalized
RubyFound:
Expand All @@ -60,7 +60,7 @@ IntCmp $InstallRuby 0 RubyInstallDone
nsisdl::download "${RubyURL}" "${RubyDownload}"

DetailPrint "Installing Ruby (${RubyDownload})"
nsExec::ExecToLog "${RubyDownload} /tasks=assocfiles,modpath /verysilent /dir=$INSTDIR\Ruby"
nsExec::ExecToLog "${RubyDownload} /tasks=assocfiles,modpath /verysilent /dir=$RubyDir"
RubyInstallDone:

StrCpy $DevKitDir "$RubyDir\DevKit"
Expand All @@ -81,7 +81,7 @@ DevKitDone:
DetailPrint "Configuring Ruby DevKit...."
nsExec::ExecToLog "$RubyBin $DevKitDir\dk.rb init"
nsExec::ExecToLog "$RubyBin $DevKitDir\dk.rb install"
nsExec::ExecToLog "$gemBin install win32-open3 ruby-wmi windows-api windows-pr --no-rdoc --no-ri --verbose"
nsExec::ExecToLog "$gemBin install win32-open3-19 rdp-ruby-wmi windows-api windows-pr --no-rdoc --no-ri --verbose"

DetailPrint "Installing Chef..."
nsExec::ExecToLog "$gemBin install chef --no-ri --no-rdoc --verbose";
Expand Down

0 comments on commit b4c1b4f

Please sign in to comment.