Merge pull request #123 from railsinstaller/ruby3.1.3

Ruby3.1.3
railsinstaller · Mar 17, 2023 · a45f56e · a45f56e
2 parents 4519885 + c2b277b
commit a45f56e
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 11 deletions.
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-4.0.0
+4.0.1
diff --git a/config/railsinstaller.yml b/config/railsinstaller.yml
@@ -8,13 +8,13 @@
       :name: rails
       :version: "7.0.4"
 
-:ruby312:
+:ruby313:
   :category: component
-  :title: Ruby 3.1.2
-  :name: Ruby312
+  :title: Ruby 3.1.3
+  :name: Ruby313
   :regex: '^.*$'
-  :url: "https://github.com/robertmabbs/railsinstaller-rubydevkit/releases/download/rubyinstaller-devkit-3.1.2-1-x64/rubyinstaller-devkit-3.1.2-1-x64.7z"
-  :rename: Ruby3.1.2
+  :url: "https://github.com/robertmabbs/railsinstaller-rubydevkit/releases/download/rubyinstaller-devkit-3.1.3-1-x64/rubyinstaller-devkit-3.1.3-1-x64.7z"
+  :rename: Ruby3.1.3
 
 :bsdtar:
   :name: BSDTar
@@ -33,3 +33,11 @@
   :binary: "7za.exe"
   :regex: '^7za\.exe$'
   :url: "http://downloads.sourceforge.net/project/sevenzip/7-Zip/9.20/7za920.zip"
+
+:git:
+  :category: component
+  :title: Git 2.38.1
+  :name: Git
+  :url: "https://github.com/robertmabbs/railsinstaller-git/releases/download/2.38.1/PortableGit.zip"
+  :target: "Git"
+  :regex: '^.*$'
diff --git a/lib/railsinstaller/actions.rb b/lib/railsinstaller/actions.rb
@@ -3,7 +3,7 @@ module RailsInstaller
   def self.build!
 
   components = [
-    BSDTar, SevenZip
+    BSDTar, SevenZip, Git
     ]
 
     components.each do |package|
@@ -19,7 +19,7 @@ def self.build!
 
     # link_devkit_with_ruby
 
-    # stage_git
+   # stage_git
 
     # stage_postgresql
 
@@ -64,7 +64,7 @@ def self.package!
       iscc " \"#{File.join(RailsInstaller::Root, "resources", "railsinstaller", "railsinstaller.iss")}\"",
         "/DInstallerVersion=\"#{railsinstaller_version}\"",
         "/DStagePath=\"#{RailsInstaller::Stage}\"",
-        "/DRubyPath=\"#{RailsInstaller::Ruby312.rename}\"",
+        "/DRubyPath=\"#{RailsInstaller::Ruby313.rename}\"",
         "/DResourcesPath=\"#{File.join(RailsInstaller::Root, "resources")}\"",
         "/O\"#{RailsInstaller::PackageDir}\"",
         "/Frailsinstaller-#{railsinstaller_version}"

diff --git a/lib/railsinstaller/methods.rb b/lib/railsinstaller/methods.rb
@@ -238,15 +238,15 @@ def self.stage_git
   end
 
   def self.stage_gem_update  
-  ruby_path = File.join(Stage, Ruby312.rename)
+  ruby_path = File.join(Stage, Ruby313.rename)
 
   line = %Q(#{File.join(ruby_path, "bin", "gem")} update )
   sh line
   end
 
   def self.stage_gems
     section Gems
-    build_gems(File.join(Stage, Ruby312.rename), Gems.list)
+    build_gems(File.join(Stage, Ruby313.rename), Gems.list)
   end
 
   def self.fix_batch_files

diff --git a/resources/railsinstaller/railsinstaller.iss b/resources/railsinstaller/railsinstaller.iss
@@ -106,6 +106,7 @@ en.DiskSpaceMBLabel=Required free disk space: ~[mb] MB
 [Files]
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 Source: {#StagePath}\{#RubyPath}\*; DestDir: {app}\{#RubyPath}; Flags: recursesubdirs createallsubdirs
+Source: {#StagePath}\Git\*; DestDir: {app}\Git; Flags: recursesubdirs createallsubdirs
 ;Source: {#StagePath}\Git\*; DestDir: {app}\Git; Check: InstallGit; Flags: recursesubdirs createallsubdirs
 ;Source: {#StagePath}\DevKit\*; DestDir: {app}\DevKit; Excludes: "config.yml"; Flags: recursesubdirs createallsubdirs
 ;Source: {#StagePath}\DevKit\config.yml; DestDir: {app}\DevKit; AfterInstall: UpdateDevKitConfig('{app}\{#RubyPath}', '{app}\DevKit\config.yml')
@@ -161,6 +162,7 @@ begin
 
       if IsModifyPath then
         ModifyPath([ExpandConstant('{app}') + '\{#RubyPath}\bin']);
+        ModifyPath([ExpandConstant('{app}') + '\Git\bin']);
 
     end else
       MsgBox('Looks like you''ve got on older, unsupported Windows version.' #13 +
@@ -187,6 +189,7 @@ begin
       if GetPreviousData('PathModified', 'no') = 'yes' then
 	    begin
         ModifyPath([ExpandConstant('{app}') + '\{#RubyPath}\bin']);
+        ModifyPath([ExpandConstant('{app}') + '\Git\bin']);
 		end
     end;
   end;