diff --git a/config/path b/config/path index 21e68e73a7..4cc1bf05c8 100644 --- a/config/path +++ b/config/path @@ -171,5 +171,24 @@ else fi BUILD_INDENT_SIZE=4 +# define colors + black="\e[0;30m" + boldblack="\e[1;30m" + red="\e[0;31m" + boldred="\e[1;31m" + green="\e[0;32m" + boldgreen="\e[1;32m" + yellow="\e[0;33m" + boldyellow="\e[1;33m" + blue="\e[0;34m" + boldblue="\e[1;34m" + magenta="\e[0;35m" + boldmagenta="\e[1;35m" + cyan="\e[0;36m" + boldcyan="\e[1;36m" + white="\e[0;37m" + boldwhite="\e[1;37m" + endcolor="\e[0m" + # multilib? nah unset CONFIG_SITE diff --git a/scripts/autoreconf b/scripts/autoreconf index 5883b69415..588f9d03f4 100755 --- a/scripts/autoreconf +++ b/scripts/autoreconf @@ -24,7 +24,7 @@ [ ! -f "$PKG_BUILD/configure.in" -a ! -f "$PKG_BUILD/configure.ac" ] && echo "configure.in or configure.ac not found" && exit 1 -printf "%${BUILD_INDENT}c AUTORECONF $1\n" ' '>&$SILENT_OUT +printf "%${BUILD_INDENT}c ${boldmagenta}AUTORECONF${endcolor} $1\n" ' '>&$SILENT_OUT export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE)) touch $PKG_BUILD/NEWS $PKG_BUILD/AUTHORS $PKG_BUILD/ChangeLog diff --git a/scripts/build b/scripts/build index 0a0c3d5ea7..209edb4a2a 100755 --- a/scripts/build +++ b/scripts/build @@ -64,9 +64,9 @@ if [ ! -f $STAMP ]; then rm -f $STAMP if [ -f $PKG_DIR/package.mk ]; then - printf "%${BUILD_INDENT}c BUILD $PACKAGE_NAME ($TARGET)\n" ' '>&$SILENT_OUT - elif [ -f $PKG_DIR/build ]; then - printf "%${BUILD_INDENT}c BUILD $PACKAGE_NAME (deprecated packageformat, please convert soon!)\n" ' '>&$SILENT_OUT + printf "%${BUILD_INDENT}c ${boldyellow}BUILD${endcolor} $PACKAGE_NAME ${boldwhite}($TARGET)${endcolor}\n" ' '>&$SILENT_OUT + elif [ -f $PKG_DIR/install ]; then + printf "%${BUILD_INDENT}c ${boldyellow}BUILD${endcolor} $PACKAGE_NAME ${boldred}(deprecated packageformat, please convert soon!)${endcolor}\n" ' '>&$SILENT_OUT fi export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE)) diff --git a/scripts/clean b/scripts/clean index bf20740cf9..5fdc5cd61c 100755 --- a/scripts/clean +++ b/scripts/clean @@ -23,7 +23,7 @@ . config/options $1 if [ ! -z "$1" ]; then - printf "%${BUILD_INDENT}c CLEAN $1\n" ' '>&$SILENT_OUT + printf "%${BUILD_INDENT}c ${boldred}CLEAN${endcolor} $1\n" ' '>&$SILENT_OUT export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE)) if [ "$CLEAN_SOURCES" = true ]; then @@ -35,7 +35,7 @@ if [ ! -z "$1" ]; then if [ -d $i -a -f "$i/.openelec-unpack" ] ; then . "$i/.openelec-unpack" if [ "$STAMP_PKG_NAME" = "$1" ]; then - printf "%${BUILD_INDENT}c * Removing $i ...\n" ' '>&$SILENT_OUT + printf "%${BUILD_INDENT}c ${boldred}*${endcolor} ${red}Removing $i ...${endcolor}\n" ' '>&$SILENT_OUT rm -rf $i fi else diff --git a/scripts/get b/scripts/get index 5d58970205..4d5539274c 100755 --- a/scripts/get +++ b/scripts/get @@ -61,7 +61,7 @@ if [ -n "$PKG_URL" ]; then rm -f $STAMP - printf "%${BUILD_INDENT}c GET $1\n" ' '>&$SILENT_OUT + printf "%${BUILD_INDENT}c ${boldcyan}GET${endcolor} $1\n" ' '>&$SILENT_OUT export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE)) until [ -f "$STAMP" ] || $WGET_CMD $i || $WGET_CMD $PACKAGE_MIRROR; do diff --git a/scripts/install b/scripts/install index c4fa16af9c..2b9ca8d795 100755 --- a/scripts/install +++ b/scripts/install @@ -57,9 +57,9 @@ fi $SCRIPTS/build $@ if [ -f $PKG_DIR/package.mk ]; then - printf "%${BUILD_INDENT}c INSTALL $PACKAGE_NAME ($TARGET)\n" ' '>&$SILENT_OUT + printf "%${BUILD_INDENT}c ${boldgreen}INSTALL${endcolor} $PACKAGE_NAME ${boldwhite}($TARGET)${endcolor}\n" ' '>&$SILENT_OUT elif [ -f $PKG_DIR/install ]; then - printf "%${BUILD_INDENT}c INSTALL $PACKAGE_NAME (deprecated packageformat, please convert soon!)\n" ' '>&$SILENT_OUT + printf "%${BUILD_INDENT}c ${boldgreen}INSTALL${endcolor} $PACKAGE_NAME ${boldred}(deprecated packageformat, please convert soon!)${endcolor}\n" ' '>&$SILENT_OUT fi export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE)) diff --git a/scripts/unpack b/scripts/unpack index e604589eeb..a9c1f944b4 100755 --- a/scripts/unpack +++ b/scripts/unpack @@ -73,7 +73,7 @@ fi [ -f "$STAMP" ] && exit 0 -printf "%${BUILD_INDENT}c UNPACK $1\n" ' '>&$SILENT_OUT +printf "%${BUILD_INDENT}c ${boldcyan}UNPACK${endcolor} $1\n" ' '>&$SILENT_OUT export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE)) if [ -n "$PKG_URL" ]; then @@ -113,10 +113,10 @@ for i in $PKG_DIR/patches/$PKG_NAME-*.patch ; do PATCH=`basename $i` PT=`echo $PATCH | sed 's/.*\.\(.*\)$/\1/'` if [ "$PT" != "patch" -a "$PT" != "$TARGET_ARCH" ]; then - printf "%${BUILD_INDENT}c SKIP PATCH (common): $i\n" ' '>&$SILENT_OUT + printf "%${BUILD_INDENT}c ${boldyellow}SKIP PATCH${endcolor} ${boldwhite}(common)${endcolor} $i\n" ' '>&$SILENT_OUT continue; else - printf "%${BUILD_INDENT}c APPLY PATCH (common): $i\n" ' '>&$SILENT_OUT + printf "%${BUILD_INDENT}c ${boldgreen}APPLY PATCH${endcolor} ${boldwhite}(common)${endcolor} $i\n" ' '>&$SILENT_OUT cat $i | patch -d `echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 >&$VERBOSE_OUT fi fi @@ -127,10 +127,10 @@ for i in $PKG_DIR/patches/$PKG_VERSION/*.patch ; do PATCH=`basename $i` PT=`echo $PATCH | sed 's/.*\.\(.*\)$/\1/'` if [ "$PT" != "patch" -a "$PT" != "$TARGET_ARCH" ]; then - printf "%${BUILD_INDENT}c SKIP PATCH ($PKG_VERSION): $i\n" ' '>&$SILENT_OUT + printf "%${BUILD_INDENT}c ${boldyellow}SKIP PATCH${endcolor} ${boldwhite}($PKG_VERSION)${endcolor} $i\n" ' '>&$SILENT_OUT continue; else - printf "%${BUILD_INDENT}c APPLY PATCH ($PKG_VERSION): $i\n" ' '>&$SILENT_OUT + printf "%${BUILD_INDENT}c ${boldgreen}APPLY PATCH${endcolor} ${boldwhite}($PKG_VERSION)${endcolor} $i\n" ' '>&$SILENT_OUT cat $i | patch -d `echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 >&$VERBOSE_OUT fi fi @@ -141,10 +141,10 @@ for i in $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/*.patch ; do PATCH=`basename $i` PT=`echo $PATCH | sed 's/.*\.\(.*\)$/\1/'` if [ "$PT" != "patch" -a "$PT" != "$TARGET_ARCH" ]; then - printf "%${BUILD_INDENT}c SKIP PATCH (project): $i\n" ' '>&$SILENT_OUT + printf "%${BUILD_INDENT}c ${boldyellow}SKIP PATCH${endcolor} ${boldwhite}(project)${endcolor} $i\n" ' '>&$SILENT_OUT continue; else - printf "%${BUILD_INDENT}c APPLY PATCH (project): $i\n" ' '>&$SILENT_OUT + printf "%${BUILD_INDENT}c ${boldgreen}APPLY PATCH${endcolor} ${boldwhite}(project)${endcolor} $i\n" ' '>&$SILENT_OUT cat $i | patch -d `echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 >&$VERBOSE_OUT fi fi @@ -153,7 +153,7 @@ done [ -f "$PKG_DIR/unpack" ] && $PKG_DIR/unpack $@ >&$VERBOSE_OUT for config in `find $BUILD/$1* -name config.guess | sed 's/config.guess//'`; do - printf "%${BUILD_INDENT}c FIXCONFIG: $config\n" ' '>&$SILENT_OUT + printf "%${BUILD_INDENT}c ${boldyellow}FIXCONFIG${endcolor} $config\n" ' '>&$SILENT_OUT [ -f "$config/config.guess" ] && cp -f $SCRIPTS/configtools/config.guess $config [ -f "$config/config.sub" ] && cp -f $SCRIPTS/configtools/config.sub $config