From cfd573c5c816d998e177ecad4b40673a06e28c68 Mon Sep 17 00:00:00 2001
From: Olia Lisa <kannar7788@gmail.com>
Date: Fri, 24 Jul 2026 11:14:42 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hiwifi-b70.sh | 6 +++---
 newifi3_d2.sh | 8 +++-----
 r2s.sh        | 9 ++++-----
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/hiwifi-b70.sh b/hiwifi-b70.sh
index bb67261..5b29ba9 100644
--- a/hiwifi-b70.sh
+++ b/hiwifi-b70.sh
@@ -154,9 +154,6 @@ build() {
 }
 
 
-project_dir="$(cd "$(dirname "$0")" && pwd)"
-cd "$project_dir"
-
 # 要构建的 ImmortalWrt 版本, 可以在 https://github.com/immortalwrt/immortalwrt 查询版本号
 default_version="25.12.1"
 version=$(ask_input "请输入 ImmortalWrt 版本" "$default_version")
@@ -165,6 +162,9 @@ version=$(ask_input "请输入 ImmortalWrt 版本" "$default_version")
 default_lan_ip="192.168.1.1"
 lan_ip=$(input_lan_ip "$default_lan_ip")
 
+project_dir="$(cd "$(dirname "$0")" && pwd)"
+cd "$project_dir"
+
 install_dependencies
 
 builder_dir="$(download_imagebuilder "$version")"
diff --git a/newifi3_d2.sh b/newifi3_d2.sh
index 413e348..81d1e6f 100644
--- a/newifi3_d2.sh
+++ b/newifi3_d2.sh
@@ -155,11 +155,6 @@ build() {
 }
 
 
-
-
-project_dir="$(cd "$(dirname "$0")" && pwd)"
-cd "$project_dir"
-
 # 要构建的 ImmortalWrt 版本, 可以在 https://github.com/immortalwrt/immortalwrt 查询版本号
 default_version="25.12.1"
 version=$(ask_input "请输入 ImmortalWrt 版本" "$default_version")
@@ -168,6 +163,9 @@ version=$(ask_input "请输入 ImmortalWrt 版本" "$default_version")
 default_lan_ip="192.168.1.1"
 lan_ip=$(input_lan_ip "$default_lan_ip")
 
+project_dir="$(cd "$(dirname "$0")" && pwd)"
+cd "$project_dir"
+
 # 安装依赖
 install_dependencies
 
diff --git a/r2s.sh b/r2s.sh
index 1156225..1df65cf 100644
--- a/r2s.sh
+++ b/r2s.sh
@@ -199,11 +199,6 @@ build(){
   fi
 }
 
-
-# 项目根目录，保证从任意位置执行 r2s.sh 都能找到其他资源
-project_dir="$(cd "$(dirname "$0")" && pwd)"
-cd "$project_dir"
-
 # 要构建的 ImmortalWrt 版本, 可以在 https://github.com/immortalwrt/immortalwrt 查询版本号
 default_version="25.12.1"
 version=$(ask_input "请输入 ImmortalWrt 版本" "$default_version")
@@ -212,6 +207,10 @@ version=$(ask_input "请输入 ImmortalWrt 版本" "$default_version")
 default_rootfs_partsize="600"
 rootfs_partsize=$(ask_input "请输入根分区大小(MB)" "$default_rootfs_partsize")
 
+# 项目根目录，保证从任意位置执行 r2s.sh 都能找到其他资源
+project_dir="$(cd "$(dirname "$0")" && pwd)"
+cd "$project_dir"
+
 # lan口ip
 default_lan_ip="192.168.1.1"
 lan_ip=$(input_lan_ip "$default_lan_ip")