From 96630d5f0d591f33276399a01181f8873f045a33 Mon Sep 17 00:00:00 2001
From: Ekko <beijiu572@gmail.com>
Date: Wed, 16 Oct 2024 23:10:18 +0800
Subject: [PATCH] feat: use new dist arch

---
 build.sh                        | 22 ++++++++++--
 modules/add-feed-base/base.sh   | 59 +++------------------------------
 modules/openclash/post-files.sh |  2 +-
 3 files changed, 24 insertions(+), 59 deletions(-)

diff --git a/build.sh b/build.sh
index 40cd8ef..7dda7a7 100755
--- a/build.sh
+++ b/build.sh
@@ -2,6 +2,14 @@
 
 default_modules="add-all-device-to-lan add-feed-key add-feed ib argon base opkg-mirror prefer-ipv6-settings statistics system tools"
 
+LOG() {
+    # echo when $LOG_ENABLE is not set or set to 1
+    if [ -z "$LOG_ENABLE" ] || [ "$LOG_ENABLE" == "1" ]; then
+        echo -e "\033[32m$1\033[0m"
+    fi
+    
+}
+
 echo "Default modules: $default_modules"
 
 final_modules=$default_modules
@@ -30,12 +38,16 @@ cp -r user_modules_in_container user_modules
 
 all_packages=
 # system env by calling env
-system_env=$(env)
+system_env=""
+if [ $USE_SYTEM_ENV ]; then
+    system_env="$(env)"
+fi
 
 deal() {
     modules_dir=$1
 
     for module in $final_modules; do
+        LOG "Processing $module in $modules_dir"
 
         if [ -f "$modules_dir/$module/packages" ]; then
             all_packages="$all_packages $(cat $modules_dir/$module/packages)"
@@ -55,8 +67,12 @@ deal() {
             for file in $(find "$modules_dir/$module/files/etc/uci-defaults" -type f); do
                 echo "$all_env" | while IFS= read -r env; do
                     env_name="$(echo "$env" | cut -d '=' -f 1)"
-                    env_value="${!env_name}"
-                    sed -e "s|\$$env_name|$env_value|g" -i $file
+                    echo "env_name: $env_name"
+                    if [ ! -z "$env_name" ]; then
+                        env_value="${!env_name}"
+                        LOG "Replacing $env_name with $env_value in $file"
+                        sed -e "s|\$$env_name|$env_value|g" -i $file
+                    fi
                 done
             done
         fi
diff --git a/modules/add-feed-base/base.sh b/modules/add-feed-base/base.sh
index 3d42509..d50c681 100755
--- a/modules/add-feed-base/base.sh
+++ b/modules/add-feed-base/base.sh
@@ -6,64 +6,13 @@ else
 fi
 
 PACKAGES_ARCH=$(cat .config | grep CONFIG_TARGET_ARCH_PACKAGES | awk -F '=' '{print $2}' | sed 's/"//g')
-OPENWRT_VERSION=$(cat ./include/version.mk | grep 'VERSION_NUMBER:=$(if' | awk -F ',' '{print $3}' | awk -F ')' '{print $1}')
-BIG_VERSION=$(echo $OPENWRT_VERSION | awk -F '.' '{print $1"."$2}')
 
-echo "PACKAGES_ARCH: $PACKAGES_ARCH OPENWRT_VERSION: $OPENWRT_VERSION BIG_VERSION: $BIG_VERSION"
-DISTRIB_ARCH=$PACKAGES_ARCH
-DISTRIB_RELEASE=$OPENWRT_VERSION
 add_packages() {
-    echo "try add $1"
-
-    all_supported=$(curl https://sourceforge.net/projects/ekko-openwrt-dist/files/$1/ | grep -e "<th.*files/$1" | grep -o 'href="/projects[^"]*"' | sed 's/href="//' | sed 's/"$//' | awk -F/ '{print $6}')
-    echo "All supported version: "
-    echo "$all_supported"
-
-    version=$(echo "$DISTRIB_RELEASE" | awk -F- '{print $1}')
-    echo "Current version: $version"
-
-    # get the first two version number
-    big_version=$(echo "$version" | awk -F. '{print $1"."$2}')
-
-    if [ "$1" == "luci" ]; then
-        supported=$(echo "$all_supported" | grep "$big_version")
-        feed_version="$DISTRIB_RELEASE"
-    else
-        supported=$(echo "$all_supported" | grep $DISTRIB_ARCH | grep $big_version)
-        feed_version="$DISTRIB_ARCH-v$DISTRIB_RELEASE"
-    fi
-
-    echo "Supported version: "
-    echo "$supported"
-
-    if [ -z "$supported" ]; then
-        echo "Your device is not supported"
-        exit 1
-    fi
-
-    full_support=0
-    for i in $supported; do
-        if [ "$i" = "$feed_version" ]; then
-            full_support=1
-            break
-        fi
-    done
-
-    if [ "$full_support" = "0" ]; then
-        echo "Your device is not fully supported"
-        echo "Find the latest version that supports your device"
-
-        # 过滤掉 rc 和 SNAPSHOT 版本, 不用 grep
-        final_release=$(echo "$supported" | grep -v "\-rc" | grep -v "SNAPSHOT" | tail -n 1)
-        if [ -z "$final_release" ]; then
-            echo "No final release found, use the latest rc version"
-            feed_version=$(echo "$supported" | grep "\-rc" | tail -n 1)
-        else
-            feed_version=$final_release
-        fi
+    dist_path="$1/$PACKAGES_ARCH"
+    if [ $1 = luci ]; then
+        dist_path="luci"
     fi
-    echo "Feed version: $feed_version"
-    EKKOG_FEED="src/gz ekkog_$1 https://ghproxy.imciel.com/https://downloads.sourceforge.net/project/ekko-openwrt-dist/$1/$feed_version"
+    EKKOG_FEED="src/gz ekkog_$1 https://ghproxy.imciel.com/https://downloads.sourceforge.net/project/ekko-openwrt-dist/$dist_path"
     mkdir -p files/etc/opkg/
     echo "$EKKOG_FEED" >> files/etc/opkg/customfeeds.conf
     # 添加软件源到第一行
diff --git a/modules/openclash/post-files.sh b/modules/openclash/post-files.sh
index fd5fbc9..58c6d41 100755
--- a/modules/openclash/post-files.sh
+++ b/modules/openclash/post-files.sh
@@ -3,4 +3,4 @@ wget --user-agent='clash' $CLASH_CONFIG_URL -O files/etc/openclash/config/config
 
 . ./modules/add-feed-base/base.sh
 
-add_packages "clash"
\ No newline at end of file
+add_packages "mihomo"
\ No newline at end of file