From 5d15bc2f50ba1475f87ff488fe8355ed2609a5a1 Mon Sep 17 00:00:00 2001
From: Endial Fang <endial@126.com>
Date: Fri, 11 Sep 2020 09:48:08 +0800
Subject: [PATCH] =?UTF-8?q?[fix:3.12]=E6=9B=B4=E6=96=B0=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA=E6=A0=BC=E5=BC=8F=EF=BC=9B=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?download=5Fpkg=E4=B8=8B=E8=BD=BD=E7=AD=BE=E5=90=8D=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile                            | 2 ++
 prebuilds/usr/local/scripts/liblog.sh | 3 ++-
 prebuilds/usr/sbin/download_pkg       | 9 +++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cc3db05..90e1306 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -51,6 +51,8 @@ FROM alpine:3.12
 ARG apt_source=default
 ARG local_url=""
 
+ENV APP_NAME=alpine-base
+
 LABEL   "Version"="v3.12" \
 	"Description"="Alpine image for Alpine 3.12." \
 	"Dockerfile"="https://github.com/colovu/docker-alpine" \
diff --git a/prebuilds/usr/local/scripts/liblog.sh b/prebuilds/usr/local/scripts/liblog.sh
index 36bae05..f67c4d4 100644
--- a/prebuilds/usr/local/scripts/liblog.sh
+++ b/prebuilds/usr/local/scripts/liblog.sh
@@ -5,6 +5,7 @@
 set +x
 
 MODULE="$(basename "$0")"
+APPNAME="${APP_NAME:-}"
 
 RESET='\033[0m'
 BOLD='\033[1m'
@@ -41,7 +42,7 @@ stderr_print() {
 #   $1 - 日志类型
 #   $2 - 日志信息
 LOG() {
-    stderr_print "${ENV_DEBUG:+${CYAN}${MODULE:-} ${MAGENTA}$(date "+%T.%2N")}${RESET} ${*}"
+    stderr_print "${CYAN}${APP_NAME:-}${ENV_DEBUG:+\:${MODULE:-} ${MAGENTA}$(date "+%T")}${RESET} ${*}"
 }
 
 # 输出调试类日志信息，尽量少使用
diff --git a/prebuilds/usr/sbin/download_pkg b/prebuilds/usr/sbin/download_pkg
index 7d1cba4..ca216c4 100755
--- a/prebuilds/usr/sbin/download_pkg
+++ b/prebuilds/usr/sbin/download_pkg
@@ -110,14 +110,15 @@ cd $INSTALL_ROOT
 
 LOG_I "Downloading $PACKAGE package"
 for url in $PACKAGE_URLS; do
-	LOG_D "Try $url/$PACKAGE"
+  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" || wget -O "$CACHE_ROOT/$PACKAGE.asc" "$url/$PACKAGE.sign"
-            if [ -e "$CACHE_ROOT/$PACKAGE.asc" ]; then
-                break
+            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
+              exit 1
             fi
         fi
+        break
     fi
 done