From 178718b87135c100ebb7909bdfdabd3b1839afe1 Mon Sep 17 00:00:00 2001
From: SukkaW <isukkaw@gmail.com>
Date: Fri, 3 Aug 2018 11:44:38 +0800
Subject: [PATCH] feat(combine): add alternative address output

---
 checker.sh | 100 ++++++++++++++++++++++++++++++++++++++++++-----------
 combine.sh |  90 +++++++++++++++++++++++++++++++----------------
 2 files changed, 141 insertions(+), 49 deletions(-)

diff --git a/checker.sh b/checker.sh
index 92f438a..8401483 100644
--- a/checker.sh
+++ b/checker.sh
@@ -2,68 +2,128 @@ mkdir ./public
 mkdir ./tmp
 
 echo '-------------------------------------'
-echo 'Checking Chrome Stable arm Android ......'
+echo 'Checking Chrome Stable x86 ......'
 echo '-------------------------------------'
-echo ''
 
 curl "https://tools.google.com/service/update2" --data "<?xml version='1.0' encoding='UTF-8'?>
             <request protocol='3.0' version='1.3.23.9' shell_version='1.3.21.103' ismachine='0'
                      sessionid='{3597644B-2952-4F92-AE55-D315F45F80A5}' installsource='ondemandcheckforupdate'
                      requestid='{CD7523AD-A40D-49F4-AEEF-8C114B804658}' dedup='cr'>
             <hw sse='1' sse2='1' sse3='1' ssse3='1' sse41='1' sse42='1' avx='1' physmemory='12582912' />
-            <os platform='android' version='6.3' arch='arm'/>
-            <app appid='{8A69D345-D564-463C-AFF1-A69D9E530F96}' version='' nextversion='' lang='' brand='GGLS' client=''>
+            <os platform='win' version='6.3' arch='x86'/>
+            <app appid='{8A69D345-D564-463C-AFF1-A69D9E530F96}' ap='-multi-chrome' version='' nextversion='' lang='' brand='GGLS' client=''>
                 <updatecheck/>
             </app>
-            </request>" > ./tmp/stable-arm.unformat.xml
+            </request>" > ./tmp/stable-x86.unformat.xml
 
 echo ''
 echo '-------------------------------------'
-echo 'Checking Chrome Beta arm Android ......'
+echo 'Checking Chrome Stable x64 ......'
 echo '-------------------------------------'
-echo ''
 
 curl "https://tools.google.com/service/update2" --data "<?xml version='1.0' encoding='UTF-8'?>
             <request protocol='3.0' version='1.3.23.9' shell_version='1.3.21.103' ismachine='0'
                      sessionid='{3597644B-2952-4F92-AE55-D315F45F80A5}' installsource='ondemandcheckforupdate'
                      requestid='{CD7523AD-A40D-49F4-AEEF-8C114B804658}' dedup='cr'>
             <hw sse='1' sse2='1' sse3='1' ssse3='1' sse41='1' sse42='1' avx='1' physmemory='12582912' />
-            <os platform='android' version='6.3' arch='arm'/>
-            <app appid='{8A69D345-D564-463C-AFF1-A69D9E530F96}' version='' nextversion='' lang='' brand='GGLS' client=''>
+            <os platform='win' version='6.3' arch='x64'/>
+            <app appid='{8A69D345-D564-463C-AFF1-A69D9E530F96}' ap='x64-stable-multi-chrome' version='' nextversion='' lang='' brand='GGLS' client=''>
                 <updatecheck/>
             </app>
-            </request>" > ./tmp/beta-arm.unformat.xml
+            </request>" > ./tmp/stable-x64.unformat.xml
 
 echo ''
 echo '-------------------------------------'
-echo 'Checking Chrome Dev arm Android ......'
+echo 'Checking Chrome Beta x86 ......'
 echo '-------------------------------------'
-echo ''
 
 curl "https://tools.google.com/service/update2" --data "<?xml version='1.0' encoding='UTF-8'?>
             <request protocol='3.0' version='1.3.23.9' shell_version='1.3.21.103' ismachine='0'
                      sessionid='{3597644B-2952-4F92-AE55-D315F45F80A5}' installsource='ondemandcheckforupdate'
                      requestid='{CD7523AD-A40D-49F4-AEEF-8C114B804658}' dedup='cr'>
             <hw sse='1' sse2='1' sse3='1' ssse3='1' sse41='1' sse42='1' avx='1' physmemory='12582912' />
-            <os platform='android' version='6.3' arch='arm'/>
-            <app appid='{8A69D345-D564-463C-AFF1-A69D9E530F96}' version='' nextversion='' lang='' brand='GGLS' client=''>
+            <os platform='win' version='6.3' arch='x86'/>
+            <app appid='{8A69D345-D564-463C-AFF1-A69D9E530F96}' ap='1.1-beta' version='' nextversion='' lang='' brand='GGLS' client=''>
                 <updatecheck/>
             </app>
-            </request>" > ./tmp/dev-arm.unformat.xml
+            </request>" > ./tmp/beta-x86.unformat.xml
 
 echo ''
 echo '-------------------------------------'
-echo 'Checking Chrome Canary arm Android ......'
+echo 'Checking Chrome Beta x64 ......'
 echo '-------------------------------------'
-echo ''
 
 curl "https://tools.google.com/service/update2" --data "<?xml version='1.0' encoding='UTF-8'?>
             <request protocol='3.0' version='1.3.23.9' shell_version='1.3.21.103' ismachine='0'
                      sessionid='{3597644B-2952-4F92-AE55-D315F45F80A5}' installsource='ondemandcheckforupdate'
                      requestid='{CD7523AD-A40D-49F4-AEEF-8C114B804658}' dedup='cr'>
             <hw sse='1' sse2='1' sse3='1' ssse3='1' sse41='1' sse42='1' avx='1' physmemory='12582912' />
-            <os platform='android' version='6.3' arch='arm'/>
-            <app appid='{4EA16AC7-FD5A-47C3-875B-DBF4A2008C20}' version='' nextversion='' lang='' brand='GGLS' client=''>
+            <os platform='win' version='6.3' arch='x64'/>
+            <app appid='{8A69D345-D564-463C-AFF1-A69D9E530F96}' ap='x64-beta-multi-chrome' version='' nextversion='' lang='' brand='GGLS' client=''>
                 <updatecheck/>
             </app>
-            </request>" > ./tmp/canary-arm.unformat.xml
+            </request>" > ./tmp/beta-x64.unformat.xml
+
+echo ''
+echo '-------------------------------------'
+echo 'Checking Chrome Dev x86 ......'
+echo '-------------------------------------'
+
+curl "https://tools.google.com/service/update2" --data "<?xml version='1.0' encoding='UTF-8'?>
+            <request protocol='3.0' version='1.3.23.9' shell_version='1.3.21.103' ismachine='0'
+                     sessionid='{3597644B-2952-4F92-AE55-D315F45F80A5}' installsource='ondemandcheckforupdate'
+                     requestid='{CD7523AD-A40D-49F4-AEEF-8C114B804658}' dedup='cr'>
+            <hw sse='1' sse2='1' sse3='1' ssse3='1' sse41='1' sse42='1' avx='1' physmemory='12582912' />
+            <os platform='win' version='6.3' arch='x86'/>
+            <app appid='{8A69D345-D564-463C-AFF1-A69D9E530F96}' ap='2.0-dev' version='' nextversion='' lang='' brand='GGLS' client=''>
+                <updatecheck/>
+            </app>
+            </request>" > ./tmp/dev-x86.unformat.xml
+
+echo ''
+echo '-------------------------------------'
+echo 'Checking Chrome Dev x64 ......'
+echo '-------------------------------------'
+
+curl "https://tools.google.com/service/update2" --data "<?xml version='1.0' encoding='UTF-8'?>
+            <request protocol='3.0' version='1.3.23.9' shell_version='1.3.21.103' ismachine='0'
+                     sessionid='{3597644B-2952-4F92-AE55-D315F45F80A5}' installsource='ondemandcheckforupdate'
+                     requestid='{CD7523AD-A40D-49F4-AEEF-8C114B804658}' dedup='cr'>
+            <hw sse='1' sse2='1' sse3='1' ssse3='1' sse41='1' sse42='1' avx='1' physmemory='12582912' />
+            <os platform='win' version='6.3' arch='x64'/>
+            <app appid='{8A69D345-D564-463C-AFF1-A69D9E530F96}' ap='x64-dev-multi-chrome' version='' nextversion='' lang='' brand='GGLS' client=''>
+                <updatecheck/>
+            </app>
+            </request>" > ./tmp/dev-x64.unformat.xml
+
+echo ''
+echo '-------------------------------------'
+echo 'Checking Chrome Canary x86 ......'
+echo '-------------------------------------'
+
+curl "https://tools.google.com/service/update2" --data "<?xml version='1.0' encoding='UTF-8'?>
+            <request protocol='3.0' version='1.3.23.9' shell_version='1.3.21.103' ismachine='0'
+                     sessionid='{3597644B-2952-4F92-AE55-D315F45F80A5}' installsource='ondemandcheckforupdate'
+                     requestid='{CD7523AD-A40D-49F4-AEEF-8C114B804658}' dedup='cr'>
+            <hw sse='1' sse2='1' sse3='1' ssse3='1' sse41='1' sse42='1' avx='1' physmemory='12582912' />
+            <os platform='win' version='6.3' arch='x86'/>
+            <app appid='{4EA16AC7-FD5A-47C3-875B-DBF4A2008C20}' ap='' version='' nextversion='' lang='' brand='GGLS' client=''>
+                <updatecheck/>
+            </app>
+            </request>" > ./tmp/canary-x86.unformat.xml
+
+echo ''
+echo '-------------------------------------'
+echo 'Checking Chrome Canary x64 ......'
+echo '-------------------------------------'
+
+curl "https://tools.google.com/service/update2" --data "<?xml version='1.0' encoding='UTF-8'?>
+            <request protocol='3.0' version='1.3.23.9' shell_version='1.3.21.103' ismachine='0'
+                     sessionid='{3597644B-2952-4F92-AE55-D315F45F80A5}' installsource='ondemandcheckforupdate'
+                     requestid='{CD7523AD-A40D-49F4-AEEF-8C114B804658}' dedup='cr'>
+            <hw sse='1' sse2='1' sse3='1' ssse3='1' sse41='1' sse42='1' avx='1' physmemory='12582912' />
+            <os platform='win' version='6.3' arch='x64'/>
+            <app appid='{4EA16AC7-FD5A-47C3-875B-DBF4A2008C20}' ap='x64-canary' version='' nextversion='' lang='' brand='GGLS' client=''>
+                <updatecheck/>
+            </app>
+            </request>" > ./tmp/canary-x64.unformat.xml
\ No newline at end of file
diff --git a/combine.sh b/combine.sh
index 5d50f2f..579c283 100644
--- a/combine.sh
+++ b/combine.sh
@@ -2,19 +2,21 @@ echo ''
 echo '-------------------------------------'
 echo 'Formatting XML Files ......'
 echo '-------------------------------------'
-echo ''
 
 cd ./tmp
-xmllint --format stable-arm.unformat.xml > stable-arm.format.xml
-xmllint --format beta-arm.unformat.xml > beta-arm.format.xml
-xmllint --format dev-arm.unformat.xml > dev-arm.format.xml
-xmllint --format canary-arm.unformat.xml > canary-arm.format.xml
+xmllint --format stable-x86.unformat.xml > stable-x86.format.xml
+xmllint --format stable-x64.unformat.xml > stable-x64.format.xml
+xmllint --format beta-x86.unformat.xml > beta-x86.format.xml
+xmllint --format beta-x64.unformat.xml > beta-x64.format.xml
+xmllint --format dev-x86.unformat.xml > dev-x86.format.xml
+xmllint --format dev-x64.unformat.xml > dev-x64.format.xml
+xmllint --format canary-x86.unformat.xml > canary-x86.format.xml
+xmllint --format canary-x64.unformat.xml > canary-x64.format.xml
 
 echo ''
 echo '-------------------------------------'
 echo 'Combining XML Files ......'
 echo '-------------------------------------'
-echo ''
 
 echo '<?xml version="1.0" encoding="UTF-8"?>' > chrome.tmp.xml
 
@@ -23,29 +25,61 @@ echo '<chromechecker>' >> chrome.tmp.xml
 DATE="$(echo $(date --rfc-2822))"
 echo '<time checktime="'$DATE'"/>' >> chrome.tmp.xml
 
-echo '<stable-arm>' >> chrome.tmp.xml
-cat stable-arm.format.xml | grep '<manifest version' >> chrome.tmp.xml
-cat stable-arm.format.xml | grep '<url codebase="https://dl.google.com/' >> chrome.tmp.xml
-cat stable-arm.format.xml | grep '<package fp' >> chrome.tmp.xml
-echo '</stable-arm>' >> chrome.tmp.xml
+echo '<stable86>' >> chrome.tmp.xml
+cat stable-x86.format.xml | grep '<manifest version' >> chrome.tmp.xml
+cat stable-x86.format.xml | grep '<url codebase="https://dl.google.com/' >> chrome.tmp.xml
+cat stable-x86.format.xml | grep '<url codebase="https://redirector.gvt1.com/' >> chrome.tmp.xml
+cat stable-x86.format.xml | grep '<package fp' >> chrome.tmp.xml
+echo '</stable86>' >> chrome.tmp.xml
 
-echo '<beta-arm>' >> chrome.tmp.xml
-cat beta-arm.format.xml | grep '<manifest version' >> chrome.tmp.xml
-cat beta-arm.format.xml | grep '<url codebase="https://dl.google.com/' >> chrome.tmp.xml
-cat beta-arm.format.xml | grep '<package fp' >> chrome.tmp.xml
-echo '</beta-arm>' >> chrome.tmp.xml
+echo '<stable64>' >> chrome.tmp.xml
+cat stable-x64.format.xml | grep '<manifest version' >> chrome.tmp.xml
+cat stable-x64.format.xml | grep '<url codebase="https://dl.google.com/' >> chrome.tmp.xml
+cat stable-x64.format.xml | grep '<url codebase="https://redirector.gvt1.com/' >> chrome.tmp.xml
+cat stable-x64.format.xml | grep '<package fp' >> chrome.tmp.xml
+echo '</stable64>' >> chrome.tmp.xml
 
-echo '<dev-arm>' >> chrome.tmp.xml
-cat dev-arm.format.xml | grep '<manifest version' >> chrome.tmp.xml
-cat dev-arm.format.xml | grep '<url codebase="https://dl.google.com/' >> chrome.tmp.xml
-cat dev-arm.format.xml | grep '<package fp' >> chrome.tmp.xml
-echo '</devarm>' >> chrome.tmp.xml
+echo '<beta86>' >> chrome.tmp.xml
+cat beta-x86.format.xml | grep '<manifest version' >> chrome.tmp.xml
+cat beta-x86.format.xml | grep '<url codebase="https://dl.google.com/' >> chrome.tmp.xml
+cat beta-x86.format.xml | grep '<url codebase="https://redirector.gvt1.com/' >> chrome.tmp.xml
+cat beta-x86.format.xml | grep '<package fp' >> chrome.tmp.xml
+echo '</beta86>' >> chrome.tmp.xml
 
-echo '<canary-arm>' >> chrome.tmp.xml
-cat canary-arm.format.xml | grep '<manifest version' >> chrome.tmp.xml
-cat canary-arm.format.xml | grep '<url codebase="https://dl.google.com/' >> chrome.tmp.xml
-cat canary-arm.format.xml | grep '<package fp' >> chrome.tmp.xml
-echo '</canary-arm>' >> chrome.tmp.xml
+echo '<beta64>' >> chrome.tmp.xml
+cat beta-x64.format.xml | grep '<manifest version' >> chrome.tmp.xml
+cat beta-x64.format.xml | grep '<url codebase="https://dl.google.com/' >> chrome.tmp.xml
+cat beta-x64.format.xml | grep '<url codebase="https://redirector.gvt1.com/' >> chrome.tmp.xml
+cat beta-x64.format.xml | grep '<package fp' >> chrome.tmp.xml
+echo '</beta64>' >> chrome.tmp.xml
+
+echo '<dev86>' >> chrome.tmp.xml
+cat dev-x86.format.xml | grep '<manifest version' >> chrome.tmp.xml
+cat dev-x86.format.xml | grep '<url codebase="https://dl.google.com/' >> chrome.tmp.xml
+cat dev-x86.format.xml | grep '<url codebase="https://redirector.gvt1.com/' >> chrome.tmp.xml
+cat dev-x86.format.xml | grep '<package fp' >> chrome.tmp.xml
+echo '</dev86>' >> chrome.tmp.xml
+
+echo '<dev64>' >> chrome.tmp.xml
+cat dev-x64.format.xml | grep '<manifest version' >> chrome.tmp.xml
+cat dev-x64.format.xml | grep '<url codebase="https://dl.google.com/' >> chrome.tmp.xml
+cat dev-x64.format.xml | grep '<url codebase="https://redirector.gvt1.com/' >> chrome.tmp.xml
+cat dev-x64.format.xml | grep '<package fp' >> chrome.tmp.xml
+echo '</dev64>' >> chrome.tmp.xml
+
+echo '<canary86>' >> chrome.tmp.xml
+cat canary-x86.format.xml | grep '<manifest version' >> chrome.tmp.xml
+cat canary-x86.format.xml | grep '<url codebase="https://dl.google.com/' >> chrome.tmp.xml
+cat dev-x64.format.xml | grep '<url codebase="https://redirector.gvt1.com/' >> chrome.tmp.xml
+cat canary-x86.format.xml | grep '<package fp' >> chrome.tmp.xml
+echo '</canary86>' >> chrome.tmp.xml
+
+echo '<canary64>' >> chrome.tmp.xml
+cat canary-x64.format.xml | grep '<manifest version' >> chrome.tmp.xml
+cat canary-x64.format.xml | grep '<url codebase="https://dl.google.com/' >> chrome.tmp.xml
+cat canary-x64.format.xml | grep '<url codebase="https://redirector.gvt1.com/' >> chrome.tmp.xml
+cat canary-x64.format.xml | grep '<package fp' >> chrome.tmp.xml
+echo '</canary64>' >> chrome.tmp.xml
 
 echo '</chromechecker>' >> chrome.tmp.xml
 
@@ -53,7 +87,6 @@ echo ''
 echo '-------------------------------------'
 echo 'Formatting Output ......'
 echo '-------------------------------------'
-echo ''
 
 sed -i 's|">|"/>|g' chrome.tmp.xml
 xmllint --format chrome.tmp.xml > chrome.xml
@@ -62,11 +95,10 @@ echo ''
 echo '-------------------------------------'
 echo 'Compressing Output ......'
 echo '-------------------------------------'
-echo ''
 
 xmllint --noblanks chrome.xml > chrome.min.xml
 
 cp -rf ./chrome.xml ../public/chrome.xml
 cp -rf ./chrome.min.xml ../public/chrome.min.xml
 
-cd ..
+cd ..
\ No newline at end of file