From 58c314d9bc5cc9b1ff09c776737633f79f42adf7 Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Tue, 7 Apr 2015 07:49:25 +0700 Subject: [PATCH] merge pull request #6 Signed-off-by: Willy Sudiarto Raharjo --- mate-build-base.sh | 4 ++-- mate-build-deps.sh | 4 ++-- mate-build-extra.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mate-build-base.sh b/mate-build-base.sh index fffef0e..20c18fd 100755 --- a/mate-build-base.sh +++ b/mate-build-base.sh @@ -76,7 +76,7 @@ for dir in \ build=$(cat ${package}.SlackBuild | grep "BUILD:" | cut -d "-" -f2 | rev | cut -c 2- | rev) # Check for duplicate sources - sourcefile="$(ls -l $MSBROOT/$dir/${package}-*.tar.?z* | wc -l)" + sourcefile="$(ls -l $MSBROOT/$dir/${package}-*.tar.?z* 2>/dev/null | wc -l)" if [ $sourcefile -gt 1 ]; then echo "You have following duplicate sources:" ls $MSBROOT/$dir/${package}-*.tar.?z* | cut -d " " -f1 @@ -87,7 +87,7 @@ for dir in \ # The real build starts here sh ${package}.SlackBuild || exit 1 if [ "$INST" = "1" ]; then - PACKAGE=`ls $TMP/${package}-${version}-*-${build}*.txz` + PACKAGE=$(ls $TMP/${package}-${version}-*-${build}*.txz 2>/dev/null) if [ -f "$PACKAGE" ]; then upgradepkg --install-new --reinstall "$PACKAGE" else diff --git a/mate-build-deps.sh b/mate-build-deps.sh index 076c0e9..6156c07 100755 --- a/mate-build-deps.sh +++ b/mate-build-deps.sh @@ -80,7 +80,7 @@ for dir in \ build=$(cat ${package}.SlackBuild | grep "BUILD:" | cut -d "-" -f2 | rev | cut -c 2- | rev) # Check for duplicate sources - sourcefile="$(ls -l $MSBROOT/$dir/${package}-*.tar.?z* | wc -l)" + sourcefile="$(ls -l $MSBROOT/$dir/${package}-*.tar.?z* 2>/dev/null | wc -l)" if [ $sourcefile -gt 1 ]; then echo "You have following duplicate sources:" ls $MSBROOT/$dir/${package}-*.tar.?z* | cut -d " " -f1 @@ -91,7 +91,7 @@ for dir in \ # The real build starts here sh ${package}.SlackBuild || exit 1 if [ "$INST" = "1" ]; then - PACKAGE=`ls $TMP/${package}-${version}-*-${build}*.txz` + PACKAGE=$(ls $TMP/${package}-${version}-*-${build}*.txz 2>/dev/null) if [ -f "$PACKAGE" ]; then upgradepkg --install-new --reinstall "$PACKAGE" else diff --git a/mate-build-extra.sh b/mate-build-extra.sh index ec4165e..9ab5d22 100755 --- a/mate-build-extra.sh +++ b/mate-build-extra.sh @@ -65,7 +65,7 @@ for dir in \ build=$(cat ${package}.SlackBuild | grep "BUILD:" | cut -d "-" -f2 | rev | cut -c 2- | rev) # Check for duplicate sources - sourcefile="$(ls -l $MSBROOT/$dir/${package}-*.tar.?z* | wc -l)" + sourcefile="$(ls -l $MSBROOT/$dir/${package}-*.tar.?z* 2>/dev/null | wc -l)" if [ $sourcefile -gt 1 ]; then echo "You have following duplicate sources:" ls $MSBROOT/$dir/${package}-*.tar.?z* | cut -d " " -f1 @@ -76,7 +76,7 @@ for dir in \ # The real build starts here sh ${package}.SlackBuild || exit 1 if [ "$INST" = "1" ]; then - PACKAGE=`ls $TMP/${package}-${version}-*-${build}*.txz` + PACKAGE=$(ls $TMP/${package}-${version}-*-${build}*.txz 2>/dev/null) if [ -f "$PACKAGE" ]; then upgradepkg --install-new --reinstall "$PACKAGE" else