[fix:3.12]更新日志输出格式；修复download_pkg下载签名文件错误问题

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" \

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} ${*}"
 }
 
 # 输出调试类日志信息，尽量少使用

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