From e8169aa8801055540e158e0026bff7fa67a7727c Mon Sep 17 00:00:00 2001 From: soulgalore Date: Sat, 8 Mar 2014 20:29:47 +0100 Subject: [PATCH] if we use IE or Chrome, use firstPaint as default #387 --- bin/sitespeed.io-sites | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/bin/sitespeed.io-sites b/bin/sitespeed.io-sites index 6a4d36e7f..8c284091b 100755 --- a/bin/sitespeed.io-sites +++ b/bin/sitespeed.io-sites @@ -64,7 +64,7 @@ HIDE_MENU="-Dcom.soulgalore.velocity.key.hidemenu=true" ## By default browser timings isn't collected COLLECT_BROWSER_TIMINGS=false ## And no browser is chosen -BROWSER= +BROWSERS= ## Pointing out the rule properties where summary rules are defined SUMMARY_PROPERTY_DESKTOP="-Dcom.soulgalore.velocity.sitespeed.rules.file="$SITESPEED_HOME"/dependencies/rules-desktop.properties" @@ -72,6 +72,9 @@ SUMMARY_PROPERTY_MOBILE="-Dcom.soulgalore.velocity.sitespeed.rules.file="$SITESP # The default one is desktop, if you choose mobile rules, then you will have the mobile version SUMMARY_PROPERTY=$SUMMARY_PROPERTY_DESKTOP +## The colums that will be showed, check http://www.sitespeed.io/documentation/#multiplecolumns +COLUMNS= + #******************************************************* # Main program # @@ -131,7 +134,7 @@ do e)COLUMNS=$OPTARG;; i)FILE_NAME=$OPTARG;; l)RULESET=$OPTARG;; - c)BROWSER=$OPTARG;; + c)BROWSERS=$OPTARG;; a)USER_AGENT=$OPTARG;; ?) ;; @@ -152,9 +155,16 @@ if [ "$COLUMNS" != "" ] else # Default colums COLUMNS="-Dcom.soulgalore.velocity.key.columns=median-ruleScore,median-criticalPathScore,median-requests,median-imageWeightPerPage,median-pageWeight,median-requestsWithoutExpires,median-assetsCacheTime,median-domainsPerPage" - if [ "$BROWSER" != "" ] + if [ "$BROWSERS" != "" ] then - COLUMNS="$COLUMNS",median-serverResponseTime,median-domContentLoadedTime + COLUMNS="$COLUMNS",median-serverResponseTime + ## Extra: If we use chrome or IE , always add the firstpaint + if [[ "$BROWSERS" == *chrome* ]] || [[ "$BROWSERS " == *ie* ]] + then + COLUMNS="$COLUMNS",median-firstPaintTime + else + COLUMNS="$COLUMNS",median-domContentLoadedTime + fi fi fi