diff --git a/announcement.gemspec b/announcement.gemspec index 4fe66ab..79a61b0 100644 --- a/announcement.gemspec +++ b/announcement.gemspec @@ -76,9 +76,9 @@ if old_gemfile_text != new_gemfile_text Bundler.with_clean_env{%x[screen -ls | grep auto_reopen_#{dir_name} | cut -d. -f1 | awk '{print $1}' | xargs kill]} end if files.count ==0 - command1 = "cd #{env_pwd} ; gem install bundler -v 1.17.3 ; bundle update --force" + command1 = "gem install bundler -v 1.17.3 ; bundle update --force" else - command1 = "cd #{env_pwd} ; gem install bundler -v 1.17.3 ; mv -f Gemfile.lock Gemfile.lock.bak123 ; bundle update --force" + command1 = "gem install bundler -v 1.17.3 ; mv -f Gemfile.lock Gemfile.lock.bak123 ; bundle update --force" end filedata = File.read(env_pwd+"/built_in_extensions.rb") exist_str = "gem 'patchfile', git: 'http://gitlab.tp.rulingcom.com/chiu/patch_file.git'" @@ -90,7 +90,8 @@ if old_gemfile_text != new_gemfile_text f.puts exist_str } end - all_command = "#{command1} ; cd #{env_pwd} ; #{command2} #{command3} #{command4} ; kill -s TERM `cat tmp/pids/unicorn.pid` ; unset UNICORN_FD ; bundle exec #{unicorn_rails} -c config/unicorn.rb -D -E #{mode}|at now" + all_command = "#{command1} ; #{command2} #{command3} #{command4} ; kill -s TERM `cat tmp/pids/unicorn.pid` ; unset UNICORN_FD ; bundle exec #{unicorn_rails} -c config/unicorn.rb -D -E #{mode}|at now;" + all_command = all_command + "watch -n 30 \"unset UNICORN_FD && bundle exec #{unicorn_rails} -c config/unicorn.rb -D -E #{mode}|at now\"" #file = File.new(File.join(env_pwd,'bundle_update_background.sh'),"w") #file.write(all_command) #file.chmod(0755) @@ -99,7 +100,7 @@ if old_gemfile_text != new_gemfile_text Bundler.with_clean_env do puts env_pwd puts mode - exec("cd #{env_pwd} && screen -d -m -S bundle_update_#{dir_name} bash -c \"#{all_command}\" && screen -d -m -S auto_reopen_#{dir_name} watch -n 30 \"unset UNICORN_FD && bundle exec #{unicorn_rails} -c config/unicorn.rb -D -E #{mode}|at now\"") + exec("cd #{env_pwd} && screen -d -m -S auto_reopen_#{dir_name} bash -c \"#{all_command}\"") end end now_priority = Thread.current.priority.to_i