Windows fixes

sshaw · Mar 18, 2017 · 7673303 · 7673303
1 parent 6a75be4
commit 7673303
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/app/app.rb b/app/app.rb
@@ -36,6 +36,8 @@ class App < Padrino::Application
 
           configure :production do
             config_file ITMSWEB_CONFIG
+            # Padrino requires this else it will raise an exception
+            set :delivery_method, :smtp if Gem.win_platform?
           end
 
           configure :test do

diff --git a/upgrade.rb b/upgrade.rb
@@ -33,7 +33,7 @@ def upgrade_gemfile(gemfile)
 
 abort "usage: upgrade CURRENT_INSTALLATION_DIRECTORY" if ARGV.none?
 
-install_root = ARGV.shift
+install_root = File.expand_path(ARGV.shift)
 failure("cannot find the current installation directory #{install_root}") unless File.directory?(install_root)
 
 not_in_root = "missing %s; upgrade must be run in the upgraded version's root directory"