Merge pull request v2fly#25 from v2fly/develop

Merge branches to solve v2fly#20
sibalma · Jul 14, 2020 · 730a24c · 730a24c
2 parents ca6e20b + d982eaf
commit 730a24c
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/install-release.sh b/install-release.sh
@@ -335,8 +335,11 @@ install_v2ray() {
     install_file v2ray
     install_file v2ctl
     install -d /usr/local/lib/v2ray/
-    install_file geoip.dat
-    install_file geosite.dat
+    # If the file exists, geoip.dat and geosite.dat will not be installed or updated
+    if [[ ! -f "/usr/local/lib/v2ray/.undat" ]]; then
+        install_file geoip.dat
+        install_file geosite.dat
+    fi
 
     # Install V2Ray configuration file to /usr/local/etc/v2ray/
     if [[ ! -d '/usr/local/etc/v2ray/' ]]; then
@@ -518,8 +521,11 @@ main() {
     install_startup_service_file
     echo 'installed: /usr/local/bin/v2ray'
     echo 'installed: /usr/local/bin/v2ctl'
-    echo 'installed: /usr/local/lib/v2ray/geoip.dat'
-    echo 'installed: /usr/local/lib/v2ray/geosite.dat'
+    # If the file exists, the content output of installing or updating geoip.dat and geosite.dat will not be displayed
+    if [[ ! -f "/usr/local/lib/v2ray/.undat" ]]; then
+        echo 'installed: /usr/local/lib/v2ray/geoip.dat'
+        echo 'installed: /usr/local/lib/v2ray/geosite.dat'
+    fi
     if [[ "$CONFDIR" -eq '1' ]]; then
         echo 'installed: /usr/local/etc/v2ray/00_log.json'
         echo 'installed: /usr/local/etc/v2ray/01_api.json'