From 4a428e3c8510fb2242fb7f7714f400312ab1f272 Mon Sep 17 00:00:00 2001 From: thomas Date: Tue, 10 Sep 2019 12:27:13 +0200 Subject: [PATCH] Make logs more readable Since script delivers terminal output, the logs look ugly in an editor. The sed line in build.sh pulls line endings straight, additionally 'wget --no-verbose' produces less control character clutter in the logs. --- TEMPLATE.sh | 2 +- tools/build.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/TEMPLATE.sh b/TEMPLATE.sh index b025955..081ba13 100755 --- a/TEMPLATE.sh +++ b/TEMPLATE.sh @@ -32,7 +32,7 @@ BUILDDIR=$PREFIX/build mkdir -p $BUILDDIR cd $BUILDDIR -test -e xxxxxx.tar.gz || wget https://xxxxxx/xxxxxx.tar.gz +test -e xxxxxx.tar.gz || wget --no-verbose https://xxxxxx/xxxxxx.tar.gz test -d xxxxxx || tar xvf xxxxxx.tar.gz cd xxxxxx ./configure \ diff --git a/tools/build.sh b/tools/build.sh index e9bb81a..17b278c 100755 --- a/tools/build.sh +++ b/tools/build.sh @@ -64,6 +64,7 @@ chmod a+rx "$PKG.build.sh" echo "sudo -u build script -q -e -c \"./$PKG.build.sh\" /package/pkg/$PKG/$PKG.build.log" ( sudo -u build script -q -e -c "./$PKG.build.sh" /package/pkg/$PKG/$PKG.build.log + sudo -u build sed -i -e 's/\r$//' /package/pkg/$PKG/$PKG.build.log sudo -u build cp "$PKG.build.sh" "/package/pkg/$PKG/$PKG.build.sh" )