From 94a1f34d8705a6c48f5e9bb4f5e55dbf6b46d766 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 7552505..0a23760 100755 --- a/mate-build-base.sh +++ b/mate-build-base.sh @@ -57,10 +57,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) @@ -76,11 +76,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 @@ -88,7 +88,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 76b6290..91a1418 100755 --- a/mate-build-extra.sh +++ b/mate-build-extra.sh @@ -59,10 +59,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) @@ -78,11 +78,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 @@ -90,7 +90,7 @@ for dir in \ exit 1 fi fi - + # back to original directory cd $MSBROOT done