fix: discard setting,conf when install

twoone-3 · twoone-3 · commit bb317edaf5b5 · 2025-05-14T13:02:47.000+08:00
diff --git a/changelog.md b/changelog.md
@@ -1,8 +1,5 @@
 # Changelog
 
-- 添加了全模块中英双语支持
-- 尝试解决部分设备无法启动的问题
-- 添加了 debug.sh 作为排错工具
-- 移除了无效的黑白名单
-- 配置文件改名 setting.conf
-- 其它文本提示类的改进
+- 修复安装模块时 `settings.conf` 无法保留的问题
+- 优化了安装模块语序与emoji
+- 更新了密码加密串（原文未变）
diff --git a/src/bin/AdGuardHome.yaml b/src/bin/AdGuardHome.yaml
@@ -6,7 +6,7 @@ http:
   session_ttl: 720h
 users:
   - name: root
-    password: $2a$10$zHcQbG4nXIzPB/Cj5M9lQ.qbQH/EZAT2wakz/sK1.b/d4ey2oqUd2
+    password: $2b$12$D3zeMIBFfzcQTqGqB.k7GOkMvqx1jgsrdiRCn2kwOHl.kNmmPfMom
 auth_attempts: 5
 block_auth_min: 15
 http_proxy: ""
@@ -77,7 +77,7 @@ tls:
   force_https: false
   port_https: 443
   port_dns_over_tls: 853
-  port_dns_over_quic: 784
+  port_dns_over_quic: 853
   port_dnscrypt: 0
   dnscrypt_config_file: ""
   allow_unencrypted_doh: false
@@ -127,7 +127,7 @@ filtering:
   blocking_ipv6: ""
   blocked_services:
     schedule:
-      time_zone: UTC
+      time_zone: Asia/Shanghai
     ids: []
   protection_disabled_until: null
   safe_search:
@@ -148,7 +148,7 @@ filtering:
   safesearch_cache_size: 1048576
   parental_cache_size: 1048576
   cache_time: 30
-  filters_update_interval: 72
+  filters_update_interval: 24
   blocked_response_ttl: 10
   filtering_enabled: true
   parental_enabled: false
@@ -158,7 +158,7 @@ clients:
   runtime_sources:
     whois: true
     arp: true
-    rdns: false
+    rdns: true
     dhcp: true
     hosts: true
   persistent: []
@@ -169,7 +169,7 @@ log:
   max_size: 100
   max_age: 3
   compress: false
-  local_time: true
+  local_time: false
   verbose: false
 os:
   group: ""
diff --git a/src/bin/data/filters/1732747955.txt b/src/bin/data/filters/1732747955.txt
@@ -54,14 +54,14 @@
 ||ads-api-o.api.leiniao.com^
 ||ads-api.tiktok.com^
 ||ads-api.twitter.com^
+||ads-img-al.xhscdn.com^
 ||ads-img-qc.xhscdn.com^
 ||ads-marketing-vivofs.vivo.com.cn^
 ||ads-sdk-api.ranfenghd.com^
 ||ads-sg.tiktok.com^
 ||ads-video-al.xhscdn.com^
 ||ads-video-qc.xhscdn.com^
 ||ads.95516.com^
-||ads.flurry.com^
 ||ads.google.cn^
 ||ads.huan.tv^
 ||ads.huantest.com^
@@ -71,6 +71,7 @@
 ||ads.music.126.net^
 ||ads.pinterest.com^
 ||ads.pubmatic.com^
+||ads.raidrive.com^
 ||ads.servebom.com^
 ||ads.service.kugou.com^
 ||ads.tiktok.com^
@@ -536,6 +537,7 @@
 ||p6-be-pack-sign.pglstatp-toutiao.com^
 ||pagead2.googleadservices.com^
 ||pagead2.googlesyndication.com^
+||pay.sboot.cn^
 ||pcdn.xmcdn.com^
 ||pcm-img.zhls.qq.com^
 ||pgdt.gtimg.cn^
@@ -747,6 +749,7 @@
 ||widgets.pinterest.com^
 ||wildcard.moatads.com.edgekey.net^
 ||win.gdt.qq.com^
+||wn.x.jd.com^
 ||ws-keyboard.shouji.sogou.com^
 ||ws.sj.qq.com^
 ||wv.inner-active.mobi^
diff --git a/src/customize.sh b/src/customize.sh
@@ -24,47 +24,50 @@ unzip -o "$ZIPFILE" "service.sh" -d "$MODPATH" >/dev/null 2>&1
 unzip -o "$ZIPFILE" "uninstall.sh" -d "$MODPATH" >/dev/null 2>&1
 
 extract_keep_config() {
-  info "- 📁 Keeping old configuration files" "- 📁 保留原来的配置文件"
-  unzip -o "$ZIPFILE" "scripts/*" -d $AGH_DIR >/dev/null 2>&1 || error "- Failed to extract scripts" "- 解压脚本文件失败"
-  unzip -o "$ZIPFILE" "bin/*" -x "bin/AdGuardHome.yaml" -d $AGH_DIR >/dev/null 2>&1 || error "- Failed to extract binary files" "- 解压二进制文件失败"
-  info "- 📦 Extracting configuration files..." "- 📦 正在解压配置文件..."
-  unzip -o "$ZIPFILE" "settings.conf" -d $AGH_DIR >/dev/null 2>&1 || error "- Failed to extract configuration files" "- 解压配置文件失败"
+  info "- 🌈 Keeping old configuration files..." "- 🌈 保留原来的配置文件..."
+  info "- 📜 Extracting script files..." "- 📜 正在解压脚本文件..."
+  unzip -o "$ZIPFILE" "scripts/*" -d $AGH_DIR >/dev/null 2>&1 || {
+    error "- ❌ Failed to extract scripts!" "- ❌ 解压脚本文件失败！"
+  }
+  info "- 🛠️ Extracting binary files except configuration..." "- 🛠️ 正在解压二进制文件（不包括配置文件）..."
+  unzip -o "$ZIPFILE" "bin/*" -x "bin/AdGuardHome.yaml" -d $AGH_DIR >/dev/null 2>&1 || {
+    error "- ❌ Failed to extract binary files!" "- ❌ 解压二进制文件失败！"
+  }
+  info "- 🚫 Skipping configuration file extraction..." "- 🚫 跳过解压配置文件..."
 }
 
 extract_no_config() {
   info "- 💾 Backing up old configuration files with .bak extension..." "- 💾 使用 .bak 扩展名备份旧配置文件..."
   [ -f "$AGH_DIR/settings.conf" ] && mv "$AGH_DIR/settings.conf" "$AGH_DIR/settings.conf.bak"
   [ -f "$AGH_DIR/bin/AdGuardHome.yaml" ] && mv "$AGH_DIR/bin/AdGuardHome.yaml" "$AGH_DIR/bin/AdGuardHome.yaml.bak"
-  info "- 📦 Extracting script files..." "- 📦 正在解压脚本文件..."
-  unzip -o "$ZIPFILE" "scripts/*" -d $AGH_DIR >/dev/null 2>&1 || error "- Failed to extract scripts" "- 解压脚本文件失败"
-  info "- 📦 Extracting binary files..." "- 📦 正在解压二进制文件..."
-  unzip -o "$ZIPFILE" "bin/*" -d $AGH_DIR >/dev/null 2>&1 || error "- Failed to extract binary files" "- 解压二进制文件失败"
-  info "- 📦 Extracting configuration files..." "- 📦 正在解压配置文件..."
-  unzip -o "$ZIPFILE" "settings.conf" -d $AGH_DIR >/dev/null 2>&1 || error "- Failed to extract configuration files" "- 解压配置文件失败"
+  extract_all
 }
 
-first_install_extract() {
-  info "- 📦 First time installation, extracting files..." "- 📦 第一次安装，正在解压文件..."
-  mkdir -p "$AGH_DIR" "$BIN_DIR" "$SCRIPT_DIR"
-  info "- 📦 Extracting script files..." "- 📦 正在解压脚本文件..."
-  unzip -o "$ZIPFILE" "scripts/*" -d $AGH_DIR >/dev/null 2>&1 || error "- Failed to extract scripts" "- 解压脚本文件失败"
-  info "- 📦 Extracting binary files..." "- 📦 正在解压二进制文件..."
-  unzip -o "$ZIPFILE" "bin/*" -d $AGH_DIR >/dev/null 2>&1 || error "- Failed to extract binary files" "- 解压二进制文件失败"
-  info "- 📦 Extracting configuration files..." "- 📦 正在解压配置文件..."
-  unzip -o "$ZIPFILE" "settings.conf" -d $AGH_DIR >/dev/null 2>&1 || error "- Failed to extract configuration files" "- 解压配置文件失败"
+extract_all() {
+  info "- 🌟 Extracting script files..." "- 🌟 正在解压脚本文件..."
+  unzip -o "$ZIPFILE" "scripts/*" -d $AGH_DIR >/dev/null 2>&1 || {
+    error "- ❌ Failed to extract scripts" "- ❌ 解压脚本文件失败"
+  }
+  info "- 🛠️ Extracting binary files..." "- 🛠️ 正在解压二进制文件..."
+  unzip -o "$ZIPFILE" "bin/*" -d $AGH_DIR >/dev/null 2>&1 || {
+    error "- ❌ Failed to extract binary files" "- ❌ 解压二进制文件失败"
+  }
+  info "- 📜 Extracting configuration files..." "- 📜 正在解压配置文件..."
+  unzip -o "$ZIPFILE" "settings.conf" -d $AGH_DIR >/dev/null 2>&1 || {
+    error "- ❌ Failed to extract configuration files" "- ❌ 解压配置文件失败"
+  }
 }
 
 if [ -d "$AGH_DIR" ]; then
-  info "- ⏹️ Stopping all AdGuardHome processes..." "- ⏹️ 正在停止所有 AdGuardHome 进程..."
-  pkill -f "AdGuardHome" || pkill -9 -f "AdGuardHome"
-  sleep 1
-  info "- 🔄 Found old version, do you want to keep the old configuration? (If not, it will be automatically backed up)" "- 🔄 发现旧版模块，是否保留原来的配置文件？（若不保留则自动备份）"
+  info "- ⏹️ Found old version, stopping all AdGuardHome processes..." "- ⏹️ 发现旧版模块，正在停止所有 AdGuardHome 进程..."
+  pkill -f "AdGuardHome" || pkill -9 -f "AdGuardHome" 
+  info "- 🔄 Do you want to keep the old configuration? (If not, it will be automatically backed up)" "- 🔄 是否保留原来的配置文件？（若不保留则自动备份）"
   info "- 🔊 (Volume Up = Yes, Volume Down = No, 10s no input = No)" "- 🔊 （音量上键 = 是, 音量下键 = 否，10秒无操作 = 否）"
   START_TIME=$(date +%s)
-  while true ; do
+  while true; do
     NOW_TIME=$(date +%s)
-    timeout 1 getevent -lc 1 2>&1 | grep KEY_VOLUME > "$TMPDIR/events"
-    if [ $(( NOW_TIME - START_TIME )) -gt 9 ]; then
+    timeout 1 getevent -lc 1 2>&1 | grep KEY_VOLUME >"$TMPDIR/events"
+    if [ $((NOW_TIME - START_TIME)) -gt 9 ]; then
       info "- ⏰ No input detected after 10 seconds, defaulting to not keep old configuration." "- ⏰ 10秒无输入，默认不保留原配置。"
       extract_no_config
       break
@@ -77,7 +80,9 @@ if [ -d "$AGH_DIR" ]; then
     fi
   done
 else
-  first_install_extract
+  info "- 📦 First time installation, extracting files..." "- 📦 第一次安装，正在解压文件..."
+  mkdir -p "$AGH_DIR" "$BIN_DIR" "$SCRIPT_DIR"
+  extract_all
 fi
 
 info "- 🔐 Setting permissions..." "- 🔐 设置权限..."
diff --git a/src/module.prop b/src/module.prop
@@ -1,7 +1,7 @@
 id=AdGuardHome
 name=AdGuardHome for Root
-version=20250511
-versionCode=36
+version=20250514
+versionCode=37
 author=twoone3
 description=none
 updateJson=https://raw.githubusercontent.com/twoone-3/AdGuardHomeForRoot/main/version.json
diff --git a/src/scripts/tool.sh b/src/scripts/tool.sh
@@ -9,6 +9,9 @@ start_adguardhome() {
 
   # to fix https://github.com/AdguardTeam/AdGuardHome/issues/7002
   export SSL_CERT_DIR="/system/etc/security/cacerts/"
+  # set timezone to Shanghai
+  export TZ="Asia/Shanghai"
+  # run binary
   busybox setuidgid "$adg_user:$adg_group" "$BIN_DIR/AdGuardHome" >>"$AGH_DIR/bin.log" 2>&1 &
   adg_pid=$!
 
@@ -23,10 +26,7 @@ start_adguardhome() {
   else
     log "😭 Error occurred, check logs for details" "😭 出现错误，请检查日志以获取详细信息"
     update_description "😭 Error occurred, check logs for details" "😭 出现错误，请检查日志以获取详细信息"
-    log "==== Last 20 lines of bin.log ====" "==== bin.log 的最后 20 行 ===="
-    tail -n 20 "$AGH_DIR/bin.log" | while read -r line; do
-      log "$line" "$line"
-    done
+    $SCRIPT_DIR/debug.sh
     exit 1
   fi
 }
diff --git a/src/service.sh b/src/service.sh
@@ -1,5 +1,5 @@
 until [ $(getprop init.svc.bootanim) = "stopped" ]; do
-  sleep 5
+  sleep 12
 done
 
 /data/adb/agh/scripts/tool.sh start
diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
-  "versionCode": 36,
-  "version": "20250511",
+  "versionCode": 37,
+  "version": "20250514",
   "zipUrl": "https://github.com/twoone-3/AdGuardHomeForRoot/releases/latest/download/AdGuardHomeForRoot_arm64.zip",
   "changelog": "https://raw.githubusercontent.com/twoone-3/AdGuardHomeForRoot/main/changelog.md"
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- "versionCode": 36,`
`3`		`- "version": "20250511",`
	`2`	`+ "versionCode": 37,`
	`3`	`+ "version": "20250514",`
`4`	`4`	`"zipUrl": "https://github.com/twoone-3/AdGuardHomeForRoot/releases/latest/download/AdGuardHomeForRoot_arm64.zip",`
`5`	`5`	`"changelog": "https://raw.githubusercontent.com/twoone-3/AdGuardHomeForRoot/main/changelog.md"`
`6`	`6`	`}`