Merge pull request #6 from raesene/master

Adding option to specify a proxy host
nccgroup · Jan 16, 2018 · dae372c · dae372c
2 parents 1e7fb69 + eea2562
commit dae372c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/autochrome.rb b/autochrome.rb
@@ -53,6 +53,10 @@ def parse_options(arg_list)
       options[:clobber] = true
     end
 
+    opts.on("-p", "--proxy-host HOST", "Proxy host") do |p|
+      options[:proxyhost] = p
+    end
+
     opts.on("-p", "--proxy-base PORT", "Local proxy base port") do |p|
       options[:proxybase] = p.to_i
     end

diff --git a/lib/processor/linux.rb b/lib/processor/linux.rb
@@ -42,7 +42,7 @@ def tweak_install
   "--disable-web-resources",
   "--safebrowsing-disable-auto-update",
   "--safebrowsing-disable-download-protection",
-  "--proxy-server=localhost:#{@proxyport}",
+  "--proxy-server=#{@proxyhost}:#{@proxyport}",
   "--user-data-dir=#{@profiledir}",
 ]
 opts.push *ARGV

diff --git a/lib/processor/macosx.rb b/lib/processor/macosx.rb
@@ -57,7 +57,7 @@ def tweak_install
   "--safebrowsing-disable-auto-update",
   "--safebrowsing-disable-download-protection",
   "--use-mock-keychain",
-  "--proxy-server=localhost:#{@proxyport}",
+  "--proxy-server=#{@proxyhost}:#{@proxyport}",
   "--user-data-dir=#{@profiledir}",
 ]
 opts.push *ARGV

diff --git a/lib/processor/unix.rb b/lib/processor/unix.rb
@@ -10,6 +10,7 @@ def initialize(opts={})
     @installdir = File.expand_path(self.class::FinalAppName, to)
     @profiledir = opts[:data_dir]
     @clobber = opts[:clobber]
+    @proxyhost = opts[:proxyhost] || 'localhost'
     @proxyport = opts[:proxybase] || 8080
   end