From a956c4dca7749249b2fdacc36800774180305bc0 Mon Sep 17 00:00:00 2001 From: chiu Date: Mon, 6 Apr 2020 10:58:55 +0800 Subject: [PATCH] fix error --- patchfile.gemspec | 68 +++++++++++++++++++------------ updatefiles/application_helper.rb | 5 ++- 2 files changed, 45 insertions(+), 28 deletions(-) diff --git a/patchfile.gemspec b/patchfile.gemspec index 124b89d..045fe86 100644 --- a/patchfile.gemspec +++ b/patchfile.gemspec @@ -2,22 +2,23 @@ $:.push File.expand_path("../lib", __FILE__) # Maintain your gem's version: require "patchfile/version" app_path = File.expand_path(__dir__) -template_path = ENV['PWD'] + '/app/templates' +dir_pwd = ENV['PWD'] +template_path = dir_pwd + '/app/templates' all_template = Dir.glob(template_path+'/*/') #if !Dir.exist?("#{ENV['PWD']}"+"/app/assets/stylesheets/lib/jquery-ui-1.12.1/") puts "copying jquery-ui" begin -`cp -r "#{app_path}/updatefiles/accessibility/jquery-ui-1.12.1/." "#{ENV['PWD']}/app/assets/stylesheets/lib/jquery-ui-1.12.1/"` +`cp -r "#{app_path}/updatefiles/accessibility/jquery-ui-1.12.1/." "#{dir_pwd}/app/assets/stylesheets/lib/jquery-ui-1.12.1/"` rescue puts "There is an error in coppying jquery-ui" end #end @original_dir = Dir.pwd -`cd "#{ENV['PWD']}" && git add app/templates/ app/assets built_in_extensions.rb config/mongoid.yml bin/ && cd "#{@original_dir}"` #using git to add modified files and to avoid git pull not working +`cd "#{dir_pwd}" && git add app/templates/ app/assets built_in_extensions.rb config/mongoid.yml bin/ && cd "#{@original_dir}"` #using git to add modified files and to avoid git pull not working #Add patchfile to Admin area @patchfile_li = File.read(app_path+"/patchfile_li.txt") @patchfile_li_choices = File.read(app_path+"/patchfile_li_choices.txt") -@file_text = File.read(ENV['PWD']+'/app/views/shared/_side_bar.html.erb') +@file_text = File.read(dir_pwd+'/app/views/shared/_side_bar.html.erb') if !@file_text.include?('
') @indert_index = @file_text.index('') @file_text.insert(@indert_index , @patchfile_li_choices) @@ -27,12 +28,12 @@ if !@file_text.include?('patchfile_li') @file_text.insert(@indert_index , @patchfile_li) end begin - f = File.open(ENV['PWD']+'/app/views/shared/_side_bar.html.erb','w') + f = File.open(dir_pwd+'/app/views/shared/_side_bar.html.erb','w') f.write(@file_text) f.close - puts "finish change patchfile in #{ENV['PWD']}/app/views/shared" + puts "finish change patchfile in #{dir_pwd}/app/views/shared" rescue - puts "Permission denied in #{ENV['PWD']}/app/views/shared" + puts "Permission denied in #{dir_pwd}/app/views/shared" end change_text = ' {{site_name}}' change_text_fix = ' {{site_name}}' @@ -40,7 +41,12 @@ change_text_fix1 = ' all_template.each do |folder| if !folder.include?('mobile') begin - require 'nokogiri' + begin + require 'nokogiri' + rescue ScriptError => e + system('gem install nokogiri -v 1.7.0.1') + require 'nokogiri' + end puts "changing header.html.erb in #{folder}/home/header.html.erb" if folder.split('/')[-1] != 'mobile' filename = folder+'home/header.html.erb' @@ -73,28 +79,38 @@ all_template.each do |folder| end end end -change_html_old = 'html.gsub("%7B%7Blogo_url_1%7D%7D",((site.site_logo_1.url.nil? ? "/assets/default-site-logo.png" : site.site_logo_1.url) rescue "/assets/default-site-logo.pngs"))' -change_html_new = 'html.gsub("%7B%7Blogo_url_1%7D%7D",((site.site_logo_1.url.nil? ? "/assets/default-site-logo.png" : site.site_logo_1.url) rescue "/assets/default-site-logo.png"))' begin - @file_text = File.read(ENV['PWD']+'/app/helpers/application_helper.rb') - File.open(ENV['PWD']+'/app/helpers/application_helper.rb_new','w+') do |f| - f.chmod 0777 - if @file_text.include?(change_html_old) - @file_text = @file_text.gsub(change_html_old,change_html_new) - elsif (!@file_text.include?(change_html_old) && !@file_text.include?(change_html_new)) - insert_index = @file_text.index('html.gsub("%7B%7Blogo_url%7D%7D"') - @file_text.insert(insert_index,change_html_new+"\n") - end - f.write(@file_text) - end - system("cp #{ENV['PWD']+'/app/helpers/application_helper.rb_new'} #{ENV['PWD']+'/app/helpers/application_helper.rb'}") - puts "finish change application_helper.rb in #{ENV['PWD']}/app/helpers/" + system("cp -f #{app_path}/updatefiles/application_helper.rb #{dir_pwd}/app/helpers/application_helper.rb") rescue => e - puts "Permission denied in #{ENV['PWD']}/app/helpers/application_helper.rb" + puts e.backtrace end +#change_html_old = 'html.gsub("%7B%7Blogo_url_1%7D%7D",((site.site_logo_1.url.nil? ? "/assets/default-site-logo.png" : site.site_logo_1.url) rescue "/assets/default-site-logo.pngs"))' +#change_html_new = 'html.gsub("%7B%7Blogo_url_1%7D%7D",((site.site_logo_1.url.nil? ? "/assets/default-site-logo.png" : site.site_logo_1.url) rescue "/assets/default-site-logo.png"))' +#begin +# @file_text = File.read(ENV['PWD']+'/app/helpers/application_helper.rb') +# File.open(ENV['PWD']+'/app/helpers/application_helper.rb_new','w+') do |f| +# f.chmod 0777 +# if @file_text.include?(change_html_old) +# @file_text = @file_text.gsub(change_html_old,change_html_new) +# elsif (!@file_text.include?(change_html_old) && !@file_text.include?(change_html_new)) +# insert_index = @file_text.index('html.gsub("%7B%7Blogo_url%7D%7D"') +# @file_text.insert(insert_index,change_html_new+"\n") +# end +# f.write(@file_text) +# end +# system("cp #{ENV['PWD']+'/app/helpers/application_helper.rb_new'} #{ENV['PWD']+'/app/helpers/application_helper.rb'}") +# puts "finish change application_helper.rb in #{ENV['PWD']}/app/helpers/" +#rescue => e +# puts "Permission denied in #{ENV['PWD']}/app/helpers/application_helper.rb" +#end begin - Site.first.update(:display_title_in_frontend=>false) -rescue + require "#{dir_pwd}/app/models/site" + site_first = Site.first + if site_first[:display_title_in_frontend].nil? + puts 'close display double title in frontend' + site_first.update_attributes(:display_title_in_frontend=>false) + end +rescue ScriptError => e puts 'unable to close title display in frontend.' end # Describe your gem and declare its dependencies: diff --git a/updatefiles/application_helper.rb b/updatefiles/application_helper.rb index 089eaab..9d71c2e 100644 --- a/updatefiles/application_helper.rb +++ b/updatefiles/application_helper.rb @@ -226,6 +226,7 @@ module ApplicationHelper def create_menu(items,level) html = "" items.each do |key,item| + next if @menus_items[level].nil? li = @menus_items[level].gsub("href_here",(item["url"] || "")) li = li.gsub("{{link_name}}",(item["name"] || "")) li = li.gsub("target_here",(item["target"] || "")) @@ -238,8 +239,8 @@ module ApplicationHelper end html = html + li end - html = @menus[level].gsub("{{here}}",html) - html = html.gsub("{{class_level}}",level.to_s) + html = @menus[level].to_s.gsub("{{here}}",html) + html = html.to_s.gsub("{{class_level}}",level.to_s) html end h = create_menu(@items,0)