KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2025-10-29 17:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Require thread-gem and solve problem with visibility of variable p in convert-grammars

Browse Source 
* The `thread`-gem is required for the script, because otherwise Ruby throws an error that `Queue` in line 259 is an uninitialized constant
* The variable `p` was previously in the same method with the status message saying `OK ‹path› ‹converted scopes›`. But `p` is now defined in load_grammars() and thus not visible when showing the OK-message in install_grammars(). This was solved by adding a path-parameter to install_grammars().
This commit is contained in:
Florian M. Schäfer
2015-01-06 22:06:55 +01:00
parent 8430f694e5
commit ab1b603c78
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
script/convert-grammars
View File

@@ -5,6 +5,7 @@ require 'net/http'
require 'optparse'
require 'plist'
require 'set'
require 'thread'
require 'tmpdir'
require 'uri'
require 'yaml'
@@ -195,7 +196,7 @@ def load_grammars(tmp_dir, source, all_scopes)
end
end
def install_grammars(grammars)
def install_grammars(grammars, path)
installed = []
grammars.each do |grammar|
@@ -204,7 +205,7 @@ def install_grammars(grammars)
installed << scope
end
$stderr.puts("OK #{p.url} (#{installed.join(', ')})")
$stderr.puts("OK #{path} (#{installed.join(', ')})")
end
def run_thread(queue, all_scopes)
@@ -221,7 +222,7 @@ def run_thread(queue, all_scopes)
Dir.mkdir(dir)
grammars = load_grammars(dir, source, all_scopes)
install_grammars(grammars) if $options[:install]
install_grammars(grammars, source) if $options[:install]
end
end
end