Miroirs/msb
1
0
Fork 0
mirror of https://gitlab.com/mateslackbuilds/msb.git synced 2024-12-25 21:59:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge pull request #6

Browse source 
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackware-id.org>
This commit is contained in:
Willy Sudiarto Raharjo 2015-04-07 07:49:25 +07:00
parent fd6d70000b
commit 58c314d9bc
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mate-build-base.sh
View file

@ -76,7 +76,7 @@ for dir in \
build=$(cat ${package}.SlackBuild | grep "BUILD:" | cut -d "-" -f2 | rev | cut -c 2- | rev) build=$(cat ${package}.SlackBuild | grep "BUILD:" | cut -d "-" -f2 | rev | cut -c 2- | rev)
# Check for duplicate sources # 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 if [ $sourcefile -gt 1 ]; then
echo "You have following duplicate sources:" echo "You have following duplicate sources:"
ls $MSBROOT/$dir/${package}-*.tar.?z* | cut -d " " -f1 ls $MSBROOT/$dir/${package}-*.tar.?z* | cut -d " " -f1
@ -87,7 +87,7 @@ for dir in \
# The real build starts here # The real build starts here
sh ${package}.SlackBuild || exit 1 sh ${package}.SlackBuild || exit 1
if [ "$INST" = "1" ]; then 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 if [ -f "$PACKAGE" ]; then
upgradepkg --install-new --reinstall "$PACKAGE" upgradepkg --install-new --reinstall "$PACKAGE"
else else

4
mate-build-deps.sh
View file

@ -80,7 +80,7 @@ for dir in \
build=$(cat ${package}.SlackBuild | grep "BUILD:" | cut -d "-" -f2 | rev | cut -c 2- | rev) build=$(cat ${package}.SlackBuild | grep "BUILD:" | cut -d "-" -f2 | rev | cut -c 2- | rev)
# Check for duplicate sources # 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 if [ $sourcefile -gt 1 ]; then
echo "You have following duplicate sources:" echo "You have following duplicate sources:"
ls $MSBROOT/$dir/${package}-*.tar.?z* | cut -d " " -f1 ls $MSBROOT/$dir/${package}-*.tar.?z* | cut -d " " -f1
@ -91,7 +91,7 @@ for dir in \
# The real build starts here # The real build starts here
sh ${package}.SlackBuild || exit 1 sh ${package}.SlackBuild || exit 1
if [ "$INST" = "1" ]; then 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 if [ -f "$PACKAGE" ]; then
upgradepkg --install-new --reinstall "$PACKAGE" upgradepkg --install-new --reinstall "$PACKAGE"
else else

4
mate-build-extra.sh
View file

@ -65,7 +65,7 @@ for dir in \
build=$(cat ${package}.SlackBuild | grep "BUILD:" | cut -d "-" -f2 | rev | cut -c 2- | rev) build=$(cat ${package}.SlackBuild | grep "BUILD:" | cut -d "-" -f2 | rev | cut -c 2- | rev)
# Check for duplicate sources # 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 if [ $sourcefile -gt 1 ]; then
echo "You have following duplicate sources:" echo "You have following duplicate sources:"
ls $MSBROOT/$dir/${package}-*.tar.?z* | cut -d " " -f1 ls $MSBROOT/$dir/${package}-*.tar.?z* | cut -d " " -f1
@ -76,7 +76,7 @@ for dir in \
# The real build starts here # The real build starts here
sh ${package}.SlackBuild || exit 1 sh ${package}.SlackBuild || exit 1
if [ "$INST" = "1" ]; then 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 if [ -f "$PACKAGE" ]; then
upgradepkg --install-new --reinstall "$PACKAGE" upgradepkg --install-new --reinstall "$PACKAGE"
else else