docker/debian-builder
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix]修复download_pkg中变量未定义问题；更新Log格式

Browse Source
This commit is contained in:
房振会
2020-09-10 11:21:41 +08:00
parent 6f4b673371
commit dd19afd166
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
alpine/prebuilds/usr/local/scripts/liblog.sh
+1 -1
View File
@@ -41,7 +41,7 @@ stderr_print() {
# $2 - 日志信息
LOG() {
#stderr_print "${ENV_DEBUG:+${CYAN}${MODULE:-} ${MAGENTA}$(date "+%T.%2N ")}${RESET}${*}"
printf "${ENV_DEBUG:+${CYAN}${MODULE:-} ${MAGENTA}%s}${RESET} %b\n" "$(date "+%T")" "${*}"
printf "${ENV_DEBUG:+${CYAN}${MODULE:-} ${MAGENTA}%s}${RESET} %b\\n" "$(date "+%T.%2N")" "${*}"
}
# 输出调试类日志信息，尽量少使用
alpine/prebuilds/usr/sbin/download_pkg
+2 -2
View File
@@ -112,7 +112,7 @@ LOG_I "Downloading $PACKAGE package"
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
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"
@@ -123,7 +123,7 @@ for url in $PACKAGE_URLS; do
fi
done
if [ "$PACKAGE_SHA256" ]; then
if [ -n "${PACKAGE_SHA256:-}" ]; then
LOG_I "Verifying package integrity"
echo "$PACKAGE_SHA256 *$CACHE_ROOT/$PACKAGE" | sha256sum -c -
fi
prebuilds/usr/local/scripts/liblog.sh
+1 -1
View File
@@ -41,7 +41,7 @@ stderr_print() {
# $2 - 日志信息
LOG() {
#stderr_print "${ENV_DEBUG:+${CYAN}${MODULE:-} ${MAGENTA}$(date "+%T.%2N ")}${RESET}${*}"
printf "${ENV_DEBUG:+${CYAN}${MODULE:-} ${MAGENTA}%s}${RESET} %b\n" "$(date "+%T")" "${*}"
printf "${ENV_DEBUG:+${CYAN}${MODULE:-} ${MAGENTA}%s}${RESET} %b\\n" "$(date "+%T")" "${*}"
}
# 输出调试类日志信息，尽量少使用
prebuilds/usr/sbin/download_pkg
+2 -2
View File
@@ -112,7 +112,7 @@ LOG_I "Downloading $PACKAGE package"
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
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"
@@ -123,7 +123,7 @@ for url in $PACKAGE_URLS; do
fi
done
if [ "$PACKAGE_SHA256" ]; then
if [ -n "${PACKAGE_SHA256:-}" ]; then
LOG_I "Verifying package integrity"
echo "$PACKAGE_SHA256 *$CACHE_ROOT/$PACKAGE" | sha256sum -c -
fi