From 96a40a63262bad800f9ccd3525455b75d98c1fc3 Mon Sep 17 00:00:00 2001 From: chiu Date: Mon, 16 Mar 2020 16:25:50 +0800 Subject: [PATCH] fix error --- temp_file/app/controllers/admin/sites_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/temp_file/app/controllers/admin/sites_controller.rb b/temp_file/app/controllers/admin/sites_controller.rb index b467a4c..1c0e91c 100644 --- a/temp_file/app/controllers/admin/sites_controller.rb +++ b/temp_file/app/controllers/admin/sites_controller.rb @@ -174,10 +174,10 @@ class Admin::SitesController < OrbitAdminController end git = 'git_1.9.1/usr/bin/git' end - git_add_except_public = Dir['*'].select{|v| v!= 'public' && v!= 'log'}.collect do |v| + git_add_except_public = Dir['*'].select{|v| v!= 'public' && v!= 'log' && v != 'dump' && v != 'tmp'}.collect do |v| "#{git} add -f --all --ignore-errors '#{v}'" end.join(' ; ') - git_add_custom = (Dir['*'].select{|v| v !='app' && v != 'lib' && v != 'config' && v != 'public' && v!= 'log'} + ['app/templates','config/mongoid.yml','config/extra_lang.txt']).collect do |v| + git_add_custom = (Dir['*'].select{|v| v !='app' && v != 'lib' && v != 'config' && v != 'public' && v!= 'log' && v != 'dump' && v != 'tmp'} + ['app/templates','config/mongoid.yml','config/extra_lang.txt']).collect do |v| "#{git} add -f --all --ignore-errors '#{v}'" end.join(' ; ') git_restore = "#{git} checkout ."