From ac80e7a6e459c92950e2d1db3c9ea80b56607058 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@project-openwrt.eu.org>
Date: Sat, 16 May 2020 18:31:05 +0800
Subject: [PATCH] OpenClash: sync with upstream source

---
 .../files/usr/share/openclash/openclash_core.sh                 | 2 +-
 .../files/usr/share/openclash/openclash_fake_filter.sh          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_core.sh b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_core.sh
index 7160429322..b4d93869d3 100755
--- a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_core.sh
+++ b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_core.sh
@@ -64,7 +64,7 @@ if [ "$CORE_CV" != "$CORE_LV" ] || [ -z "$CORE_CV" ]; then
 			case $CORE_TYPE in
       	"Tun")
       	echo "正在下载【Tun】版本内核，如下载失败请尝试手动下载并上传..." >$START_LOG
-				curl -sL -m 30 --retry 2 https://github.com/Dreamacro/clash/releases/download/TUN/clash-"$CPU_MODEL"-"$CORE_LV".gz -o /tmp/clash.gz >/dev/null 2>&1
+				curl -sL -m 30 --retry 2 https://github.com/vernesong/OpenClash/releases/download/TUN-Premium/clash-"$CPU_MODEL"-"$CORE_LV".gz -o /tmp/clash.gz >/dev/null 2>&1
 				;;
 				"Game")
 				echo "正在下载【Game】版本内核，如下载失败请尝试手动下载并上传..." >$START_LOG
diff --git a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_fake_filter.sh b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_fake_filter.sh
index be72f9079e..5b9e1dce01 100755
--- a/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_fake_filter.sh
+++ b/package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_fake_filter.sh
@@ -10,7 +10,7 @@ echo "正在设置Fake-IP黑名单..." >$START_LOG
 
 rm -rf "$FAKE_FILTER_FILE" 2>/dev/null
 if [ -s "$CUSTOM_FILE" ]; then
-   cat "$CUSTOM_FILE" |while read -r line
+   cat "$CUSTOM_FILE" |while read -r line || [[ -n ${line} ]];
    do
       if [ -z "$(echo $line |grep '^ \{0,\}#' 2>/dev/null)" ]; then
          echo "  - '$line'" >> "$FAKE_FILTER_FILE"