diff options
Diffstat (limited to 'scripts/mkpkg')
| -rwxr-xr-x | scripts/mkpkg | 56 |
1 files changed, 46 insertions, 10 deletions
diff --git a/scripts/mkpkg b/scripts/mkpkg index 25c5afe6d..af47f4228 100755 --- a/scripts/mkpkg +++ b/scripts/mkpkg @@ -38,36 +38,72 @@ function process () grep "\.tar\." ${LOG} > ${DEPENDENCY} if [ ${test} == ${OK} ] ; then mv ${LOG} ${LOG_OK_FILE} - echo "OK " + printf "%-16s" "OK" + if [ "${2}X" != "X" ] ; then + printf "%-16s" "\"$2\""; + fi + if [ "${3}X" != "X" ] ; then + printf "%s" "\"$3\""; + fi + echo else mv ${LOG} ${LOG_FAIL_FILE} - printf "FAIL " - echo \"$2\" + printf "%-16s" "FAIL" + if [ "${2}X" != "X" ] ; then + printf "%-16s" "\"$2\""; + else + printf "%-16s" "\"\"" + fi + if [ "${3}X" != "X" ] ; then + printf "%s" "\"$3\""; + fi + echo fi } function build_package () { - printf "mk %-31s" "$1" + # echo "BUILD PACKAGE:1=$1 2=$2 3=$3 4=$4 5=$5 6=$6 7=$7" + printf "mk %-32s" "$1" if [ "$2X" == "X" ] ; then # no parameters clean_files $1 dirclean $1 - process $1 + process $1 "$3" + elif [ "$2X" == "?X" ] ; then # no parameters + clean_files $1 + dirclean $1 + process $1 "$3" elif [ "$2X" == "OKX" ] ; then # Previous build was OK clean_files $1 dirclean $1 - process $1 + process $1 "$3" elif [ "$2X" == "FAILX" ] ; then clean_files $1 dirclean $1 - process $1 $3 + process $1 "$3" elif [ "$2X" == "BROKENX" ] ; then - printf "BROKEN " - echo \"$3\" + printf "%-16s" "BROKEN" + if [ "${3}X" != "X" ] ; then + printf "%s" "\"$3\""; + fi + echo + elif [ "$2X" == "DISABLEDX" ] ; then + printf "%-16s" "DISABLED" + if [ "${3}X" != "X" ] ; then + printf "%s" "\"$3\""; + fi + echo + else + printf "%-16s" "?BROKEN" + if [ "${3}X" != "X" ] ; then + printf "%s" "\"$3\""; + fi + echo fi } -build_package $1 $2 $3 +#build_package $1 $2 "\"$3\"" +build_package $1 $2 "$3" |