This commit is contained in:
chiu 2020-02-25 23:12:27 +08:00
parent 2d6e13999e
commit 546bd39f4c
1 changed files with 2 additions and 2 deletions

View File

@ -117,7 +117,7 @@ if old_gemfile_text != new_gemfile_text
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'
use_cmd = 'rvm use default 2.1.10' use_cmd = 'source ~/.rvm/scripts/rvm && rvm use 2.1.10 --default;'
#else #else
# install_cmd = '' # install_cmd = ''
#end #end
@ -146,7 +146,7 @@ if old_gemfile_text != new_gemfile_text
Bundler.with_clean_env do Bundler.with_clean_env do
puts env_pwd puts env_pwd
puts mode puts mode
exec("cd #{env_pwd} && env -i HOME=\"$HOME\" bash -l -c \"#{all_command}\" ;#{use_cmd}; kill -s TERM `cat tmp/pids/unicorn.pid` ; unset UNICORN_FD ; bundle exec #{unicorn_rails} -c config/unicorn.rb -D -E #{mode}; screen -d -m -S auto_reopen_#{dir_name} #{watch_dog_cmd} ") exec("cd #{env_pwd} && env -i HOME=\"$HOME\" bash -l -c \"#{all_command}\" ;screen -d -m -S auto_reopen_#{dir_name} bash -c \"#{use_cmd} kill -s TERM `cat tmp/pids/unicorn.pid` ; unset UNICORN_FD ; bundle exec #{unicorn_rails} -c config/unicorn.rb -D -E #{mode};#{watch_dog_cmd}\" ")
end end
end end
now_priority = Thread.current.priority.to_i now_priority = Thread.current.priority.to_i