diff --git a/mate-build-deps.sh b/mate-build-deps.sh index 33bdeeb..71ff18d 100755 --- a/mate-build-deps.sh +++ b/mate-build-deps.sh @@ -67,14 +67,17 @@ for dir in \ deps/liboobs \ ; 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) + # Get the build + 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)" if [ $sourcefile -gt 1 ]; then @@ -83,11 +86,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-*.txz" + PACKAGE="${package}-$version-*-${build}*.txz" if [ -f $TMP/$PACKAGE ]; then upgradepkg --install-new --reinstall $TMP/$PACKAGE else @@ -95,7 +98,7 @@ for dir in \ exit 1 fi fi - + # back to original directory cd $MSBROOT done