From 3386a605629ad79444c2abebe172da8f5eb7f257 Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Sat, 12 Apr 2014 15:36:51 +0700 Subject: [PATCH] Update Build Script. Signed-off-by: Willy Sudiarto Raharjo --- mate-build-base.sh | 12 ++++++------ mate-build-extra.sh | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mate-build-base.sh b/mate-build-base.sh index 249f393..d67ef69 100755 --- a/mate-build-base.sh +++ b/mate-build-base.sh @@ -64,10 +64,10 @@ for dir in \ base/mate-themes \ ; do # Get the package name - package=$(echo $dir | cut -f2- -d /) - + package=$(echo $dir | cut -f2- -d /) + # Change to package directory - cd $MSBROOT/$dir || exit 1 + cd $MSBROOT/$dir || exit 1 # Get the version version=$(cat ${package}.SlackBuild | grep "VERSION:" | cut -d "-" -f2 | rev | cut -c 2- | rev) @@ -83,11 +83,11 @@ for dir in \ echo "Please delete sources other than ${package}-$version to avoid problems" exit 1 fi - + # The real build starts here sh ${package}.SlackBuild || exit 1 if [ "$INST" = "1" ]; then - PACKAGE="${package}-$version-${build}*.txz" + PACKAGE="${package}-$version-*-${build}*.txz" if [ -f $TMP/$PACKAGE ]; then upgradepkg --install-new --reinstall $TMP/$PACKAGE else @@ -95,7 +95,7 @@ for dir in \ exit 1 fi fi - + # back to original directory cd $MSBROOT done diff --git a/mate-build-extra.sh b/mate-build-extra.sh index d682d83..51d3f77 100755 --- a/mate-build-extra.sh +++ b/mate-build-extra.sh @@ -78,10 +78,10 @@ for dir in \ extra/mate-screensaver \ ; do # Get the package name - package=$(echo $dir | cut -f2- -d /) - + package=$(echo $dir | cut -f2- -d /) + # Change to package directory - cd $MSBROOT/$dir || exit 1 + cd $MSBROOT/$dir || exit 1 # Get the version version=$(cat ${package}.SlackBuild | grep "VERSION:" | cut -d "-" -f2 | rev | cut -c 2- | rev) @@ -97,11 +97,11 @@ for dir in \ echo "Please delete sources other than ${package}-$version to avoid problems" exit 1 fi - + # The real build starts here sh ${package}.SlackBuild || exit 1 if [ "$INST" = "1" ]; then - PACKAGE="${package}-$version-${build}*.txz" + PACKAGE="${package}-$version-*-${build}*.txz" if [ -f $TMP/$PACKAGE ]; then upgradepkg --install-new --reinstall $TMP/$PACKAGE else @@ -109,7 +109,7 @@ for dir in \ exit 1 fi fi - + # back to original directory cd $MSBROOT done