From 3bacbce44a363cd82c6b584994faa5b7d554cf0a Mon Sep 17 00:00:00 2001 From: Dct Mei Date: Wed, 29 Apr 2020 00:07:23 +0800 Subject: [PATCH] fix: Finish correction Currently basically available. --- install-release-dat.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/install-release-dat.sh b/install-release-dat.sh index b25308d..8fefd1b 100644 --- a/install-release-dat.sh +++ b/install-release-dat.sh @@ -5,18 +5,18 @@ DOWNLOAD_LINK_GEOIP="https://github.com/v2ray/geoip/releases/latest/download/geo DOWNLOAD_LINK_GEOSITE="https://github.com/v2ray/domain-list-community/releases/latest/download/dlc.dat" download_geoip() { - curl -L -H 'Cache-Control: no-cache' -o "${V2RAY}geoip.dat.bak" "$DOWNLOAD_LINK_GEOIP" -# + curl -L -H 'Cache-Control: no-cache' -o "${V2RAY}geoip.dat.new" "$DOWNLOAD_LINK_GEOIP" -# if [ "$?" -ne '0' ]; then echo 'error: Download failed! Please check your network or try again.' exit 1 fi - curl -L -H 'Cache-Control: no-cache' -o "${V2RAY}geoip.dat.sha256sum.bak" "$DOWNLOAD_LINK_GEOIP.sha256sum" -# + curl -L -H 'Cache-Control: no-cache' -o "${V2RAY}geoip.dat.sha256sum.new" "$DOWNLOAD_LINK_GEOIP.sha256sum" -# if [ "$?" -ne '0' ]; then echo 'error: Download failed! Please check your network or try again.' exit 1 fi - SUM="$(sha256sum ${V2RAY}geoip.dat.bak | sed 's/ .*//')" - CHECKSUM="$(sed 's/ .*//' ${V2RAY}geoip.dat.sha256sum.bak)" + SUM="$(sha256sum ${V2RAY}geoip.dat.new | sed 's/ .*//')" + CHECKSUM="$(sed 's/ .*//' ${V2RAY}geoip.dat.sha256sum.new)" if [[ "$SUM" != "$CHECKSUM" ]]; then echo 'error: Check failed! Please check your network or try again.' exit 1 @@ -24,35 +24,35 @@ download_geoip() { } download_geosite() { - curl -L -H 'Cache-Control: no-cache' -o "${V2RAY}geosite.dat.bak" "$DOWNLOAD_LINK_GEOSITE" -# + curl -L -H 'Cache-Control: no-cache' -o "${V2RAY}geosite.dat.new" "$DOWNLOAD_LINK_GEOSITE" -# if [ "$?" -ne '0' ]; then echo 'error: Download failed! Please check your network or try again.' exit 1 fi - curl -L -H 'Cache-Control: no-cache' -o "${V2RAY}geosite.dat.sha256sum.bak" "$DOWNLOAD_LINK_GEOSITE.sha256sum" -# + curl -L -H 'Cache-Control: no-cache' -o "${V2RAY}geosite.dat.sha256sum.new" "$DOWNLOAD_LINK_GEOSITE.sha256sum" -# if [ "$?" -ne '0' ]; then echo 'error: Download failed! Please check your network or try again.' exit 1 fi - SUM="$(sha256sum ${V2RAY}geosite.dat.bak | sed 's/ .*//')" - CHECKSUM="$(sed 's/ .*//' ${V2RAY}geosite.dat.sha256sum.bak)" + SUM="$(sha256sum ${V2RAY}geosite.dat.new | sed 's/ .*//')" + CHECKSUM="$(sed 's/ .*//' ${V2RAY}geosite.dat.sha256sum.new)" if [[ "$SUM" != "$CHECKSUM" ]]; then echo 'error: Check failed! Please check your network or try again.' exit 1 fi } -rename_bak() { - for BAT in 'geoip' 'geosite'; do - rename '.bak' '' "${V2RAY}$DAT.dat.bak" - rm "${V2RAY}$DAT.dat.sha256sum.bak" +rename_new() { + for DAT in 'geoip' 'geosite'; do + mv "${V2RAY}$DAT.dat.new" "${V2RAY}$DAT.dat" + rm "${V2RAY}$DAT.dat.sha256sum.new" done } main() { download_geoip download_geosite - rename_bak + rename_new } main