Suppress wget command output

To reduce noise
travis-ci · Dec 28, 2017 · 17745ba · 17745ba
1 parent 94c867f
commit 17745ba
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/lib/travis/build/addons/chrome.rb b/lib/travis/build/addons/chrome.rb
@@ -6,6 +6,7 @@ module Build
     class Addons
       class Chrome < Base
         SUPER_USER_SAFE = true
+        WGET_FLAGS = ' --no-verbose'
 
         attr_reader :version
 
@@ -25,12 +26,12 @@ def after_prepare
                 sh.echo "Google Chrome addon is not supported on Precise", ansi: :yellow
               end
               sh.else do
-                sh.cmd "wget -O /tmp/$(basename $CHROME_SOURCE_URL) $CHROME_SOURCE_URL", echo: true, timing: true, retry: true
+                sh.cmd "wget#{WGET_FLAGS} -O /tmp/$(basename $CHROME_SOURCE_URL) $CHROME_SOURCE_URL", echo: true, timing: true, retry: true
                 sh.cmd "sudo dpkg -i /tmp/$(basename $CHROME_SOURCE_URL)"
               end
             end
             sh.elif '$(uname) = "Darwin"' do
-              sh.cmd "wget -O /tmp/$(basename $CHROME_SOURCE_URL) $CHROME_SOURCE_URL", echo: true, timing: true, retry: true
+              sh.cmd "wget#{WGET_FLAGS} -O /tmp/$(basename $CHROME_SOURCE_URL) $CHROME_SOURCE_URL", echo: true, timing: true, retry: true
               sh.cmd "hdiutil mount -readonly -mountpoint chrome /tmp/$(basename $CHROME_SOURCE_URL)"
               sh.cmd "sudo rm -rf /Applications/Google\\ Chrome.app"
               sh.cmd "sudo cp -a chrome/Google\\ Chrome.app /Applications"

diff --git a/lib/travis/build/addons/firefox.rb b/lib/travis/build/addons/firefox.rb
@@ -6,6 +6,7 @@ module Build
     class Addons
       class Firefox < Base
         SUPER_USER_SAFE = true
+        WGET_FLAGS = ' --no-verbose'
 
         attr_reader :version, :latest
 
@@ -23,12 +24,12 @@ def after_prepare
             sh.chown 'travis', install_dir, recursive: true
             sh.cd install_dir, echo: false, stack: true
             sh.if '$(uname) = "Linux"' do
-              sh.cmd "wget -O /tmp/#{filename} $FIREFOX_SOURCE_URL", echo: true, timing: true, retry: true
+              sh.cmd "wget#{WGET_FLAGS} -O /tmp/#{filename} $FIREFOX_SOURCE_URL", echo: true, timing: true, retry: true
               sh.cmd "tar xf /tmp/#{filename}"
               sh.export 'PATH', "#{install_dir}/firefox:$PATH"
             end
             sh.elif '$(uname) = "Darwin"' do
-              sh.cmd "wget -O /tmp/#{filename('dmg')} $FIREFOX_SOURCE_URL", echo: true, timing: true, retry: true
+              sh.cmd "wget#{WGET_FLAGS} -O /tmp/#{filename('dmg')} $FIREFOX_SOURCE_URL", echo: true, timing: true, retry: true
               sh.cmd "hdiutil mount -readonly -mountpoint firefox /tmp/#{filename('dmg')}"
               sh.cmd "sudo rm -rf /Applications/Firefox.app"
               sh.cmd "sudo cp -a firefox/Firefox.app /Applications"

diff --git a/spec/build/addons/firefox_spec.rb b/spec/build/addons/firefox_spec.rb
@@ -27,7 +27,7 @@
     it { should include_sexp [:cd, '$HOME/firefox-20.0', stack: true] }
     it { should include_sexp [:export, ['FIREFOX_SOURCE_URL', "'https://#{host}/#{path}'"], echo: true] }
 
-    it { should include_sexp [:cmd, 'wget -O /tmp/firefox-20.0.tar.bz2 $FIREFOX_SOURCE_URL', echo: true, timing: true, retry: true] }
+    it { should include_sexp [:cmd, 'wget --no-verbose -O /tmp/firefox-20.0.tar.bz2 $FIREFOX_SOURCE_URL', echo: true, timing: true, retry: true] }
     it { should include_sexp [:cmd, 'tar xf /tmp/firefox-20.0.tar.bz2'] }
     it { should include_sexp [:export, ['PATH', "$HOME/firefox-20.0/firefox:$PATH"], echo: true] }
     it { should include_sexp [:cd, :back, stack: true] }