From 2521377f1faad10d6ae6f1aaab82049bd75f93bb Mon Sep 17 00:00:00 2001
From: lingyuzeng <lingyuzeng@lingyuzengdeMacBook-Air.local>
Date: Sun, 1 Mar 2026 14:49:39 +0800
Subject: [PATCH] fix: add bash safety headers, ignore GENERAL.upstream.txt,
 pass UPSTREAM_GENERAL_REF

---
 .gitignore              | 1 +
 .woodpecker/ipq60xx.yml | 2 ++
 Scripts/Handles.sh      | 2 ++
 Scripts/Packages.sh     | 1 +
 Scripts/Settings.sh     | 2 ++
 5 files changed, 8 insertions(+)

diff --git a/.gitignore b/.gitignore
index 52603d7..e660f29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ wrt-wifi/
 # configs generated by builds
 .config
 .config.old
+Config/GENERAL.upstream.txt
 
 # editor / OS
 .DS_Store
diff --git a/.woodpecker/ipq60xx.yml b/.woodpecker/ipq60xx.yml
index 8317ffd..ef2eec7 100644
--- a/.woodpecker/ipq60xx.yml
+++ b/.woodpecker/ipq60xx.yml
@@ -24,6 +24,8 @@ steps:
     commands:
       - chmod +x ${CI_WORKSPACE}/Scripts/sync_upstream_config.sh
       - ${CI_WORKSPACE}/Scripts/sync_upstream_config.sh
+    environment:
+      UPSTREAM_GENERAL_REF: ${UPSTREAM_GENERAL_REF:-main}
 
   - name: build-ipq60xx-wifi-yes
     image: ubuntu:24.04
diff --git a/Scripts/Handles.sh b/Scripts/Handles.sh
index 67572be..bf4d093 100755
--- a/Scripts/Handles.sh
+++ b/Scripts/Handles.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -euo pipefail
+
 PKG_PATH="$GITHUB_WORKSPACE/wrt/package/"
 
 #预置HomeProxy数据
diff --git a/Scripts/Packages.sh b/Scripts/Packages.sh
index 3053dbc..c54bb60 100755
--- a/Scripts/Packages.sh
+++ b/Scripts/Packages.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 #安装和更新软件包
+set -euo pipefail
 UPDATE_PACKAGE() {
 	local PKG_NAME=$1
 	local PKG_REPO=$2
diff --git a/Scripts/Settings.sh b/Scripts/Settings.sh
index 6fd66c4..18fd88d 100755
--- a/Scripts/Settings.sh
+++ b/Scripts/Settings.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -euo pipefail
+
 #移除luci-app-attendedsysupgrade
 sed -i "/attendedsysupgrade/d" $(find ./feeds/luci/collections/ -type f -name "Makefile")
 #修改默认主题