aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--trunk/conf/simplepkg.conf6
-rw-r--r--trunk/doc/CHANGELOG2
-rwxr-xr-xtrunk/src/mkbuild11
3 files changed, 18 insertions, 1 deletions
diff --git a/trunk/conf/simplepkg.conf b/trunk/conf/simplepkg.conf
index 841eddd..0c0fc73 100644
--- 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 257be66..0a95640 100644
--- 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 db8bc4f..b256ec0 100755
--- 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