aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--trunk/lib/common.sh6
-rw-r--r--trunk/mkbuild/generic.mkSlackBuild4
-rw-r--r--trunk/mkbuild/perl.mkSlackBuild4
-rwxr-xr-xtrunk/simplepkg.SlackBuild4
4 files changed, 9 insertions, 9 deletions
diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh
index 3a437c8..ec3e6f0 100644
--- a/trunk/lib/common.sh
+++ b/trunk/lib/common.sh
@@ -27,7 +27,7 @@ SIMPLARET="simplaret"
function package_name {
- echo "`basename $1 .tgz`" | sed -e 's/-[^-]*-[^-]*-[^-]*$//'
+ basename $1 .tgz | sed -e 's/-[^-]*-[^-]*-[^-]*$//'
}
@@ -49,7 +49,7 @@ function package_arch {
# get ARCH from a package name
local file pack arch
- echo `basename $1` | sed -e 's/.*\-\(.*\)\-.*.tgz$/\1/' -e 's/_slamd64$//g' -e 's/_sflack$//g'
+ basename $1 | sed -e 's/.*\-\(.*\)\-.*.tgz$/\1/' -e 's/_slamd64$//g' -e 's/_sflack$//g'
}
@@ -57,7 +57,7 @@ function package_build {
# get BUILD from a package name
local file pack build
- echo `basename $1` | sed -e 's/.*\-.*\-\(.*\).tgz$/\1/'
+ basename $1 | sed -e 's/.*\-.*\-\(.*\).tgz$/\1/'
}
diff --git a/trunk/mkbuild/generic.mkSlackBuild b/trunk/mkbuild/generic.mkSlackBuild
index 4886d6b..e655a15 100644
--- a/trunk/mkbuild/generic.mkSlackBuild
+++ b/trunk/mkbuild/generic.mkSlackBuild
@@ -1,7 +1,7 @@
#################################################################
## Generic template for SlackBuilds
##
-## Version 0.9.2 - Luis ( luis at riseup d0t net)
+## Version 0.9.3 - Luis ( luis at riseup d0t net)
## Alves ( rudsonalves at yahoo d0t com d0t br )
#################################################################
#!/bin/bash
@@ -272,6 +272,6 @@ makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERRO
<clean_builds> off
# Delete source and build directories if requested
if [ "$CLEANUP" == "yes" ]; then
- rm -rf "$PKG_SRC" "$PKG" "$PKG_WORK""
+ rm -rf "$PKG_WORK" "$PKG"
fi
</clean_builds>
diff --git a/trunk/mkbuild/perl.mkSlackBuild b/trunk/mkbuild/perl.mkSlackBuild
index 245cd01..d90dacc 100644
--- a/trunk/mkbuild/perl.mkSlackBuild
+++ b/trunk/mkbuild/perl.mkSlackBuild
@@ -1,7 +1,7 @@
###################################################
## Perl template for SlackBuilds
##
-## Based on generic.mkSlackBuild version 0.9.2 by
+## Based on generic.mkSlackBuild version 0.9.3 by
## Luis (luis at riseup d0t net) and changed by
## Rhatto (rhatto at riseup d0t net)
##
@@ -284,6 +284,6 @@ makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERRO
<clean_builds> off
# Delete source and build directories if requested
if [ "$CLEANUP" == "yes" ]; then
- rm -rf "$PKG_SRC" "$PKG" "$PKG_WORK"
+ rm -rf "$PKG_WORK" "$PKG"
fi
</clean_builds>
diff --git a/trunk/simplepkg.SlackBuild b/trunk/simplepkg.SlackBuild
index 5d058ec..83ccdf1 100755
--- a/trunk/simplepkg.SlackBuild
+++ b/trunk/simplepkg.SlackBuild
@@ -17,8 +17,8 @@
PACKAGE="simplepkg"
PACK_DIR="package-$PACKAGE"
-BUILD=${BUILD:=2rha}
-VERSION="0.6pre11"
+BUILD=${BUILD:=1rha}
+VERSION="0.6pre12"
ARCH="noarch"
LIBEXEC="/usr/libexec/$PACKAGE"
BINDIR="/usr/bin"