attempting to fix #81

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

diff --git a/trunk/conf/simplepkg.conf b/trunk/conf/simplepkg.conf
index 841eddd242658f88ffd9e9b431ef9a2efdd9e85a..0c0fc7323ec4075be0a78abe347481775a21365f 100644 (file)
--- a/trunk/conf/simplepkg.conf
+++ b/trunk/conf/simplepkg.conf
@@ -106,6 +106,12 @@ MOVE_SLACK_REQUIRED="on"
 # characters only and no spaces.
 CREATEPKG_AUTHOR=""
 
+# Set this to get author information automatically when creating a new mkbuild
+MKBUILD_AUTHOR=""
+
+# Set this to get author initials automatically when creating a new mkbuild
+MKBUILD_AUTHOR_INITIALS=""
+
 # Whether createpkg should sign packages.
 SIGN_PACKAGES="off"
 

diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG
index 257be6679aaff74f25b2fc9663df62579cafa0dd..0a956402d48cff77a7467b4aec0bafa480326563 100644 (file)
--- a/trunk/doc/CHANGELOG
+++ b/trunk/doc/CHANGELOG
@@ -57,7 +57,7 @@ simplepkg changelog
        PACKAGES_SVN, CREATEPKG_AUTHOR, SIGN_PACKAGES, SIGN_PACKAGES_USER. SIGN_PACKAGES_KEYID,
        SIGN_PACKAGES_WITH_GPG_AGENT, SOURCE_DIR_USER, SOURCE_DIR_GROUP, SIGN_MANIFESTS, 
        SIGN_MANIFESTS_KEYID, SIGN_MANIFESTS_WITH_GPG_AGENT, FORCE_MANIFEST_CHECK,
-       FORCE_MANIFEST_CHECK_SIGNATURE
+       FORCE_MANIFEST_CHECK_SIGNATURE, MKBUILD_AUTHOR, MKBUILD_AUTHOR_INITIALS
     - lspkg: fix on package search routine
     - jail-commit: using unified diff
 

diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild
index db8bc4f88fe24af8a57ef1ac93bf329670eeb9dc..b256ec0f7e083436575a1662e6f5662e14d8a0fd 100755 (executable)
--- a/trunk/src/mkbuild
+++ b/trunk/src/mkbuild
@@ -848,6 +848,9 @@ function load_parameters {
   COLOR_MODE="`eval_parameter COLOR_MODE none`"
   TMP="`eval_parameter TMP /tmp`"
 
+  MKBUILD_AUTHOR="`eval_parameter MKBUILD_AUTHOR`"
+  MKBUILD_AUTHOR_INITIALS="`eval_parameter MKBUILD_AUTHOR_INITIALS`"
+
   SIGN_MANIFESTS="`eval_boolean_parameter SIGN_MANIFESTS $off`"
   SIGN_MANIFESTS_USER="`eval_parameter SIGN_MANIFESTS_USER`"
   SIGN_MANIFESTS_KEYID="`eval_parameter SIGN_MANIFESTS_KEYID`"
@@ -1472,6 +1475,14 @@ function create_mkbuild {
   # Create a new .mkbuild parameters-file
   cp $MODEL_DIR/model.mkbuild $MKBUILD_NAME
 
+  if [ -z "$AUTHOR" ] && [ ! -z "$MKBUILD_AUTHOR" ]; then
+    AUTHOR="$MKBUILD_AUTHOR"
+  fi
+
+  if [ -z "$AUTHOR_INITIALS" ] && [ ! -z "$MKBUILD_AUTHOR_INITIALS" ]; then
+    AUTHOR_INITIALS="$MKBUILD_AUTHOR_INITIALS"
+  fi
+
   # Package Author
   if [ ! -z "$AUTHOR" ]; then
     edit_file "YOUR NAME" "${AUTHOR}" $MKBUILD_NAME