From 77e3629f63b0695cd5fae039276a8a3291cf1688 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Mon, 19 Nov 2018 09:34:24 +0000 Subject: [PATCH] scripts/create_addon: convert to build_msg Signed-off-by: Ian Leonard --- scripts/create_addon | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/create_addon b/scripts/create_addon index fd99cbe293..9810789490 100755 --- a/scripts/create_addon +++ b/scripts/create_addon @@ -113,12 +113,12 @@ pack_addon() { if [ "$ADDON_OVERWRITE" = "yes" ]; then rm $ADDON_INSTALL_DIR/$PKG_ADDON_ID-$ADDONVER.zip else - printf "%${BUILD_INDENT}c $(print_color CLR_WARNING "*** WARNING: $PKG_ADDON_ID-$ADDONVER.zip already exists. not overwriting it ***")\n" ' '>&$SILENT_OUT + build_msg "CLR_WARNING" "*** WARNING: ${PKG_ADDON_ID}-${ADDONVER}.zip already exists. Not overwrittng it. ***" return 0 fi fi cd $ADDON_BUILD - printf "%${BUILD_INDENT}c $(print_color CLR_INFO "*** compressing Addon $PKG_ADDON_ID ... ***")\n" ' '>&$SILENT_OUT + build_msg "CLR_INFO" "*** compressing addon ${PKG_ADDON_ID} ... ***" $TOOLCHAIN/bin/7za a -l -mx9 -bsp0 -bso0 -tzip $PKG_ADDON_ID-$ADDONVER.zip $PKG_ADDON_ID cd - &>/dev/null @@ -158,20 +158,20 @@ pack_addon() { ( cd $ADDON_JENKINS_DIR sha256sum $ADDON_JENKINS_ADDON_NAME.zip > $ADDON_JENKINS_ADDON_NAME.zip.sha256 ) - printf "%${BUILD_INDENT}c $(print_color CLR_INFO "*** creating $ADDON_JENKINS_ADDON_NAME.zip for Jenkins complete ***")\n" ' '>&$SILENT_OUT + build_msg "CLR_INFO" "*** creating ${ADDON_JENKINS_ADDON_NAME}.zip for Jenkins complete ***" else - printf "%${BUILD_INDENT}c $(print_color CLR_INFO "*** creating $PKG_ADDON_ID complete ***")\n" ' '>&$SILENT_OUT + build_msg "CLR_INFO" "*** creating ${PKG_ADDON_ID} complete ***" fi fi } not_supported_arch() { - printf "%${BUILD_INDENT}c $(print_color CLR_WARNING "*** SKIP: $PKG_ADDON_ID: '${DEVICE:-$PROJECT}' not supported ***")\n" ' '>&$SILENT_OUT + build_msg "CLR_WARNING" "*** SKIP: ${PKG_ADDON_ID} '${TARGET_ARCH}' not supported ***" exit 0 } not_supported_device() { - printf "%${BUILD_INDENT}c $(print_color CLR_WARNING "*** SKIP: $PKG_ADDON_ID: '$TARGET_ARCH' not supported ***")\n" ' '>&$SILENT_OUT + build_msg "CLR_WARNING" "*** SKIP: ${PKG_ADDON_ID}: '${DEVICE:-${PROJECT}}' not supported ***" exit 0 } @@ -265,7 +265,7 @@ case "$write_logs" in esac if [ -n "$log_path" ]; then mkdir -p "$log_path" - summary_file="$log_path/addon-summary.log" + summary_file="$log_path/addon-summary.log" rm -f $summary_file fi