From 5cfae24800076647e4223b1172be155922539113 Mon Sep 17 00:00:00 2001 From: chiu Date: Fri, 21 Feb 2020 15:37:33 +0800 Subject: [PATCH] try to fix not updating error --- announcement.gemspec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/announcement.gemspec b/announcement.gemspec index b31745d..b57f9b3 100644 --- a/announcement.gemspec +++ b/announcement.gemspec @@ -46,7 +46,7 @@ if old_gemfile_text != new_gemfile_text command2 = '' if old_playground != new_playground puts 'updating playground' - command2 = "cp -f #{app_path}/temp_file/playground_controller.rb #{env_pwd}/app/controllers/admin/playground_controller.rb &&" + command2 = "cp -f #{app_path}/temp_file/playground_controller.rb #{env_pwd}/app/controllers/admin/playground_controller.rb ;" #File.open(ENV['PWD']+'/app/controllers/admin/playground_controller.rb', 'w') do |file| # file.write new_playground #end @@ -56,7 +56,7 @@ if old_gemfile_text != new_gemfile_text command3 = '' if old_multithread != new_multithread puts 'updating multithread' - command3 = "cp -f #{app_path}/temp_file/multithread.rb #{env_pwd}/app/models/multithread.rb &&" + command3 = "cp -f #{app_path}/temp_file/multithread.rb #{env_pwd}/app/models/multithread.rb ;" #File.open(ENV['PWD']+'/app/models/multithread.rb', 'w') do |file| # file.write new_multithread #end @@ -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 = "cd #{env_pwd} ; 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 = "cd #{env_pwd} ; gem install bundler -v 1.17.3 ; mv -f Gemfile.lock Gemfile.lock.bak123 ; bundle update --force" end Bundler.with_clean_env{system("cd #{env_pwd} && screen -d -m -S auto_reopen_#{dir_name} watch -n 30 \"unset UNICORN_FD && bundle exec --keep-file-descriptors #{unicorn_rails} -c config/unicorn.rb -D -E #{mode}|at now\"")} filedata = File.read(env_pwd+"/built_in_extensions.rb") @@ -91,7 +91,7 @@ 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} ; 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" file = File.new(File.join(env_pwd,'bundle_update_background.sh'),"w") file.write(all_command) file.chmod(0755)