added CREATEPKG_AUTHOR config parameter

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@668 04377dda-e619-0410-9926-eae83683ac58

diff --git a/trunk/conf/simplepkg.conf b/trunk/conf/simplepkg.conf
index fa5f8636988c6c37850a9badcfa14aab112a52ff..1842b778c17182262234f9ba1af4dc9a9ef8b1a3 100644 (file)
--- a/trunk/conf/simplepkg.conf
+++ b/trunk/conf/simplepkg.conf
@@ -96,6 +96,10 @@ MOVE_BIN_PACKAGE="on"
 # Move package's slack-required to binary repository
 MOVE_SLACK_REQUIRED="on"
 
+# Set this to override the default author on each SlackBuild. Use alphabetic
+# characters only and no spaces.
+CREATEPKG_AUTHOR=""
+
 #---------------------------------------------------------------------
 #                        SIMPLARET SECTION
 #---------------------------------------------------------------------

diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG
index bdb5301707614a7e05c8c12212994d68446fc889..81d5ccba496cf1fb1fb9897390707eaf45dcb3b9 100644 (file)
--- a/trunk/doc/CHANGELOG
+++ b/trunk/doc/CHANGELOG
@@ -46,7 +46,8 @@ simplepkg changelog
       - renamed config parameter CREATE_ARCH to CREATEPKG_ARCH
       - renamed all "MAKEPKG" config parameters to "PACKAGES", "MAKEPKG_REPOS" to "PACKAGES_DIR"
       - new config parameters PACKAGES_REPOS_STYLE, MOVE_SLACK_REQUIRED, MKBUILDS_SVN_USER,
-        PACKAGES_SVN_USER, PACKAGES_SVN_GROUP, MKBUILDS_SVN_GROUP, PACKAGES_REPOS_NOARCH, PACKAGES_SVN
+        PACKAGES_SVN_USER, PACKAGES_SVN_GROUP, MKBUILDS_SVN_GROUP, PACKAGES_REPOS_NOARCH,
+        PACKAGES_SVN, CREATEPKG_AUTHOR
       - cleaner -s option output
     - lspkg: fix on package search routine
     - jail-commit: using unified diff

diff --git a/trunk/src/createpkg b/trunk/src/createpkg
index 90029f96d8bc71b44bb4b1a802afcc00d53375b2..87fa202a752d042a2b6dbf2229ac8004d754dcb8 100644 (file)
--- a/trunk/src/createpkg
+++ b/trunk/src/createpkg
@@ -260,6 +260,7 @@ function load_parameters {
   COLOR_MODE="`eval_parameter COLOR_MODE none`"
   CREATEPKG_ARCH="`eval_parameter CREATEPKG_ARCH $(default_arch)`"
   CREATEPKG_CLEANUP="`eval_parameter CREATEPKG_CLEANUP yes`"
+  CREATEPKG_AUTHOR="`eval_parameter CREATEPKG_AUTHOR`"
   TMP="`eval_parameter TMP /tmp`"
 
   REMOVE_OLD_PACKAGE="`eval_boolean_parameter REMOVE_OLD_PACKAGE $off`"
@@ -665,10 +666,25 @@ handle_error $? $PACKAGE
 
 # Get package name, arch, version and build number
 PKG_NAME="`ls -1 -c $PACKAGES_DIR/$PACKAGE-*-*-*.tgz | head -n 1 | xargs basename`"
+PACKAGE_NAME="`package_name $PKG_NAME`"
 PACKAGE_VERSION="`package_version $PKG_NAME`"
 PACKAGE_ARCH="`package_arch $PKG_NAME`"
 PACKAGE_BUILD="`package_build $PKG_NAME`"
 
+if [ ! -z "$CREATEPKG_AUTHOR" ]; then
+  AUTHOR="`echo $PACKAGE_BUILD | sed -e 's/^[0-9]*//'`"
+  if [ "$AUTHOR" != "$CREATEPKG_AUTHOR" ]; then
+    echo "Changing package build author..."
+    BUILD_NUMBER="`echo $PACKAGE_BUILD | sed -e "s/$AUTHOR$//"`"
+    NEW_BUILD="$BUILD_NUMBER""$CREATEPKG_AUTHOR"
+    mv $PACKAGES_DIR/$PKG_NAME $PACKAGES_DIR/$PACKAGE_NAME-$PACKAGE_VERSION-$PACKAGE_ARCH-$NEW_BUILD.tgz
+    PKG_NAME="$PACKAGE_NAME-$PACKAGE_VERSION-$PACKAGE_ARCH-$NEW_BUILD.tgz"
+    PACKAGE_BUILD="$NEW_BUILD"
+    AUTHOR="$CREATEPKG_AUTHOR"
+    echo "New package name is $PKG_NAME."
+  fi
+fi
+
 # Select repository directory
 if [ $MOVE_BIN_PACKAGE -eq $on ]; then
   SUBFOLDER="$( echo ${SCRIPT_BASE#$SLACKBUILDS_DIR/} )"