This commit is contained in:
chiu 2020-02-25 22:06:24 +08:00
parent d968e696a6
commit 359fa5513a
1 changed files with 5 additions and 3 deletions

View File

@ -72,7 +72,7 @@ all_template.each do |folder|
end end
end end
rescue => e rescue => e
puts "not found #{folder}assets/stylesheets/template/base/_variables.scss" puts "#{e.inspect}\nnot found #{folder}assets/stylesheets/template/base/_variables.scss"
end end
end end
end end
@ -115,9 +115,11 @@ if old_gemfile_text != new_gemfile_text
if watch_dog.scan("auto_reopen_#{dir_name}").count != 0 if watch_dog.scan("auto_reopen_#{dir_name}").count != 0
Bundler.with_clean_env{%x[screen -ls | grep auto_reopen_#{dir_name} | cut -d. -f1 | awk '{print $1}' | xargs kill]} Bundler.with_clean_env{%x[screen -ls | grep auto_reopen_#{dir_name} | cut -d. -f1 | awk '{print $1}' | xargs kill]}
end end
#if %x[ruby -v].scan(/\d\.\d\.\d/)[0] == '2.1.3' if %x[ruby -v].scan(/\d\.\d\.\d/)[0] == '2.1.3'
install_cmd = 'rvm install 2.1.10 && rvm use default 2.1.10' install_cmd = 'rvm install 2.1.10 && rvm use default 2.1.10'
#end else
install_cmd = ''
end
if files.count ==0 if files.count ==0
command1 = "gem install bundler -v 1.17.3 ; bundle install --force ; bundle update" command1 = "gem install bundler -v 1.17.3 ; bundle install --force ; bundle update"
else else