diff --git a/src/index.html b/src/index.html index 36a20df..6fc9ab0 100644 --- a/src/index.html +++ b/src/index.html @@ -168,7 +168,7 @@ 点击下载 备选地址 - 缓存服务器 + @@ -192,7 +192,7 @@ 点击下载 备选地址 - 缓存服务器 + @@ -218,7 +218,7 @@ 点击下载 备选地址 - 缓存服务器 + @@ -242,7 +242,7 @@ 点击下载 备选地址 - 缓存服务器 + @@ -268,7 +268,7 @@ 点击下载 备选地址 - 缓存服务器 + @@ -292,7 +292,7 @@ 点击下载 备选地址 - 缓存服务器 + diff --git a/util/generator.sh b/util/generator.sh index 7cbb5f3..aecc1fa 100644 --- a/util/generator.sh +++ b/util/generator.sh @@ -5,14 +5,14 @@ echo '-------------------------------------' for i in $@ do - cache="http://101.96.9.133/" + # cache="http://101.96.9.133/" version=$(sed -n '1p' ./tmp/parse/${i}-result.info) dl_base=$(sed -n '2p' ./tmp/parse/${i}-result.info) dl_alt_base=$(sed -n '3p' ./tmp/parse/${i}-result.info) dl_file=$(sed -n '4p' ./tmp/parse/${i}-result.info) dl="https://"${dl_base}${dl_file} dl_alt="https://"${dl_alt_base}${dl_file} - dl_cache=${cache}${dl_alt_base}${dl_file} + # dl_cache=${cache}${dl_alt_base}${dl_file} sha256=$(sed -n '5p' ./tmp/parse/${i}-result.info) size_raw=$(sed -n '6p' ./tmp/parse/${i}-result.info) size=$(awk 'BEGIN{printf "%.3f",('$size_raw'/'1048576')}')" MB" @@ -21,13 +21,13 @@ do sed -i "s|{{${i}-SHA256}}|$sha256|g" tmp/index.html sed -i "s|{{${i}-dl-main}}|$dl|g" tmp/index.html sed -i "s|{{${i}-dl-alternative}}|$dl_alt|g" tmp/index.html - sed -i "s|{{${i}-dl-cache}}|$dl_cache|g" tmp/index.html + # sed -i "s|{{${i}-dl-cache}}|$dl_cache|g" tmp/index.html sed -i "s|{{${i}-Size}}|$size|g" tmp/index.html sed -i "s|{{${i}-Version}}|$version|g" tmp/chrome.xml sed -i "s|{{${i}-SHA256}}|$sha256|g" tmp/chrome.xml sed -i "s|{{${i}-dl-main}}|$dl|g" tmp/chrome.xml sed -i "s|{{${i}-dl-alternative}}|$dl_alt|g" tmp/chrome.xml - sed -i "s|{{${i}-dl-cache}}|$dl_cache|g" tmp/chrome.xml + # sed -i "s|{{${i}-dl-cache}}|$dl_cache|g" tmp/chrome.xml sed -i "s|{{${i}-Size}}|$size_raw|g" tmp/chrome.xml done \ No newline at end of file diff --git a/util/parse.sh b/util/parse.sh index 5bdb4c5..4378172 100644 --- a/util/parse.sh +++ b/util/parse.sh @@ -20,10 +20,16 @@ do sed -i 's|https://||g' ./tmp/parse/${i}.info sed -i 's| ||g' ./tmp/parse/${i}.info - sed -n '14p' ./tmp/parse/${i}.info > ./tmp/parse/${i}-result.info - sed -n '8p' ./tmp/parse/${i}.info >> ./tmp/parse/${i}-result.info + # version + sed -n '16p' ./tmp/parse/${i}.info > ./tmp/parse/${i}-result.info + # download base sed -n '10p' ./tmp/parse/${i}.info >> ./tmp/parse/${i}-result.info - sed -n '23p' ./tmp/parse/${i}.info >> ./tmp/parse/${i}-result.info - sed -n '22p' ./tmp/parse/${i}.info >> ./tmp/parse/${i}-result.info + # download alternative base + sed -n '12p' ./tmp/parse/${i}.info >> ./tmp/parse/${i}-result.info + # download file + sed -n '25p' ./tmp/parse/${i}.info >> ./tmp/parse/${i}-result.info + # sha256 sed -n '24p' ./tmp/parse/${i}.info >> ./tmp/parse/${i}-result.info + # size + sed -n '26p' ./tmp/parse/${i}.info >> ./tmp/parse/${i}-result.info done