From 0bfc465de4017e5925bac816de59ad4155fe2941 Mon Sep 17 00:00:00 2001
From: Endial Fang <endial@126.com>
Date: Thu, 10 Sep 2020 15:30:42 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E4=BF=AE=E6=94=B9sbin=E4=B8=AD=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E6=96=87=E4=BB=B6=E7=BB=93=E6=9D=9F=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 prebuilds/usr/local/scripts/liblog.sh | 1 +
 prebuilds/usr/sbin/download_pkg       | 9 ++++-----
 prebuilds/usr/sbin/install_pkg        | 1 +
 prebuilds/usr/sbin/select_source      | 1 +
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/prebuilds/usr/local/scripts/liblog.sh b/prebuilds/usr/local/scripts/liblog.sh
index aebddad..36bae05 100644
--- a/prebuilds/usr/local/scripts/liblog.sh
+++ b/prebuilds/usr/local/scripts/liblog.sh
@@ -2,6 +2,7 @@
 # Ver: 1.1 by Endial Fang (endial@126.com)
 
 #[[ ${ENV_DEBUG:-false} = true ]] && set -x
+set +x
 
 MODULE="$(basename "$0")"
 
diff --git a/prebuilds/usr/sbin/download_pkg b/prebuilds/usr/sbin/download_pkg
index 764c404..d7a6f7b 100755
--- a/prebuilds/usr/sbin/download_pkg
+++ b/prebuilds/usr/sbin/download_pkg
@@ -113,13 +113,11 @@ for url in $PACKAGE_URLS; do
 	LOG_D "Try $url/$PACKAGE"
     if wget -O "$CACHE_ROOT/$PACKAGE" "$url/$PACKAGE" && [ -s "$CACHE_ROOT/$PACKAGE" ]; then
         if [ -n "${PACKAGE_KEYS:-}" ]; then
-            wget -O "$CACHE_ROOT/$PACKAGE.asc" "$url/$PACKAGE.asc"
-            if [ ! -e "$CACHE_ROOT/$PACKAGE.asc" ]; then
-                wget -O "$CACHE_ROOT/$PACKAGE.asc" "$url/$PACKAGE.sig"
+            wget -O "$CACHE_ROOT/$PACKAGE.asc" "$url/$PACKAGE.asc" || wget -O "$CACHE_ROOT/$PACKAGE.asc" "$url/$PACKAGE.sign"
+            if [ -e "$CACHE_ROOT/$PACKAGE.asc" ]; then
+                break
             fi
         fi
-        success=1
-        break
     fi
 done
 
@@ -158,3 +156,4 @@ case "$1" in
 		fi
 		;;
 esac
+
diff --git a/prebuilds/usr/sbin/install_pkg b/prebuilds/usr/sbin/install_pkg
index dafb2ae..f17d806 100755
--- a/prebuilds/usr/sbin/install_pkg
+++ b/prebuilds/usr/sbin/install_pkg
@@ -56,3 +56,4 @@ apt-get purge -y --auto-remove
 apt-get autoclean -y
 
 rm -r /var/lib/apt/lists /var/cache/apt/archives || :
+
diff --git a/prebuilds/usr/sbin/select_source b/prebuilds/usr/sbin/select_source
index d7525fa..f014542 100755
--- a/prebuilds/usr/sbin/select_source
+++ b/prebuilds/usr/sbin/select_source
@@ -4,3 +4,4 @@
 # shell 执行参数，分别为 -e(命令执行错误则退出脚本) -u(变量未定义则报错) -x(打印实际待执行的命令行)
 set -eux
 cp /etc/apt/sources/sources.list.${1:-default} /etc/apt/sources.list
+