diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-12-23 21:24:11 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-12-23 21:24:11 +0000 |
| commit | 5c7d3944cda03a29ae6349ec4bd058e405c3b8f4 (patch) | |
| tree | 37edd861a5388d07f9e6b06b64c5e1d8c70412b4 /trunk/src/createpkg | |
| parent | 9a8f7b53cefff0a1282d32112fcf353d06cb6d5c (diff) | |
| download | simplepkg-5c7d3944cda03a29ae6349ec4bd058e405c3b8f4.tar.gz simplepkg-5c7d3944cda03a29ae6349ec4bd058e405c3b8f4.tar.bz2 | |
mkbuild: adding --update-manifest and other changes (see CHANGELOG)
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@707 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk/src/createpkg')
| -rw-r--r-- | trunk/src/createpkg | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/trunk/src/createpkg b/trunk/src/createpkg index 325d120..09e38c1 100644 --- a/trunk/src/createpkg +++ b/trunk/src/createpkg @@ -257,6 +257,8 @@ function load_parameters { SLACKBUILDS_SVN="`eval_parameter SLACKBUILDS_SVN http://slack.sarava.org/slackbuilds`" SVN_USER="`eval_parameter PACKAGES_SVN_USER`" SVN_GROUP="`eval_parameter PACKAGES_SVN_GROUP`" + SOURCE_DIR_USER="`eval_parameter SOURCE_DIR_USER`" + SOURCE_DIR_GROUP="`eval_parameter SOURCE_DIR_GROUP`" COLOR_MODE="`eval_parameter COLOR_MODE none`" CREATEPKG_ARCH="`eval_parameter CREATEPKG_ARCH $(default_arch)`" @@ -267,11 +269,18 @@ function load_parameters { SIGN_PACKAGES="`eval_boolean_parameter SIGN_PACKAGES $off`" SIGN_PACKAGES_USER="`eval_parameter SIGN_PACKAGES_USER`" SIGN_PACKAGES_KEYID="`eval_parameter SIGN_PACKAGES_KEYID`" + SIGN_PACKAGES_WITH_GPG_AGENT="`eval_boolean_parameter SIGN_PACKAGES_WITH_GPG_AGENT $off`" if [ ! -z "$SIGN_PACKAGES_KEYID" ]; then SIGN_PACKAGES_KEYID="`echo $SIGN_PACKAGES_KEYID | tr '[:lower:]' '[:upper:]'`" fi + if [ "$SIGN_PACKAGES_WITH_GPG_AGENT" -eq $on ]; then + GPG_AGENT_OPTION="--use-agent" + else + GPG_AGENT_OPTION="" + fi + REMOVE_OLD_PACKAGE="`eval_boolean_parameter REMOVE_OLD_PACKAGE $off`" MOVE_BIN_PACKAGE="`eval_boolean_parameter MOVE_BIN_PACKAGE $off`" MOVE_SLACK_REQUIRED="`eval_boolean_parameter MOVE_SLACK_REQUIRED $off`" @@ -676,6 +685,16 @@ cd $SCRIPT_BASE # Check if package was built handle_error $? $PACKAGE +# Fix source folder user +if [ ! -z "$SOURCE_DIR_USER" ]; then + chown -R $SOURCE_DIR_USER $SOURCE_DIR +fi + +# Fix source folder group +if [ ! -z "$SOURCE_DIR_GROUP" ]; then + chgrp -R $SOURCE_DIR_USER $SOURCE_DIR +fi + # 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`" @@ -719,11 +738,11 @@ if [ $SIGN_PACKAGES -eq $on ]; then if [ ! -z "$SIGN_PACKAGES_USER" ]; then tmp_sign_folder="`mktemp -d $TMP/createpkg_sign.XXXXXX`" chown $SIGN_PACKAGES_USER $tmp_sign_folder - su $SIGN_PACKAGES_USER -c "gpg --use-agent --armor -sb -u $SIGN_KEYID -o $tmp_sign_folder/$PKG_NAME.asc $PACKAGES_DIR/$PKG_NAME" + su $SIGN_PACKAGES_USER -c "gpg $GPG_AGENT_OPTION --armor -sb -u $SIGN_KEYID -o $tmp_sign_folder/$PKG_NAME.asc $PACKAGES_DIR/$PKG_NAME" cp $tmp_sign_folder/$PKG_NAME.asc $PACKAGES_DIR/$PKG_NAME.asc rm -rf $tmp_sign_folder else - gpg --use-agent --armor -sb -u $SIGN_KEYID $PACKAGES_DIR/$PKG_NAME + gpg $GPG_AGENT_OPTION --armor -sb -u $SIGN_KEYID $PACKAGES_DIR/$PKG_NAME fi fi |