From e1ce88920d8e27998225287e5c5805e5f6abf2d1 Mon Sep 17 00:00:00 2001 From: meganemura Date: Wed, 4 Jan 2017 06:57:46 +0900 Subject: [PATCH] Fix add-grammar and convert-grammars (#3354) * Skip removed grammar submodule * Clean up old grammar from grammars and grammars.yml * Clean up unused grammar license Run `script/licensed`. This was missing change in 12f9295 of #3350. * Clean up license files when we replace grammar Update license files by running `script/licensed`. Since we replace grammar, the old grammar license must be removed and new grammar license must be added. --- script/add-grammar | 7 ++++++- script/convert-grammars | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/script/add-grammar b/script/add-grammar index f5a8bf11..fb7c73b9 100755 --- a/script/add-grammar +++ b/script/add-grammar @@ -84,6 +84,7 @@ if repo_old log "Deregistering: #{repo_old}" `git submodule deinit #{repo_old}` `git rm -rf #{repo_old}` + `script/convert-grammars` end log "Registering new submodule: #{repo_new}" @@ -92,7 +93,11 @@ exit 1 if $?.exitstatus > 0 `script/convert-grammars --add #{repo_new}` log "Confirming license" -`script/licensed --module "#{repo_new}"` +if repo_old + `script/licensed` +else + `script/licensed --module "#{repo_new}"` +end log "Updating grammar documentation in vendor/REAEDME.md" `bundle exec rake samples` diff --git a/script/convert-grammars b/script/convert-grammars index 64c75d14..59671253 100755 --- a/script/convert-grammars +++ b/script/convert-grammars @@ -174,6 +174,7 @@ end def load_grammars(tmp_dir, source, all_scopes) is_url = source.start_with?("http:", "https:") return [] if is_url && !$options[:remote] + return [] if !is_url && !File.exist?(source) p = if !is_url if File.directory?(source)