diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2009-01-22 01:36:35 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2009-01-22 01:36:35 +0000 |
| commit | c46804a91d09ae9d737715dfb14019458bceefa1 (patch) | |
| tree | caf50f898f9a3b1c1100305b35604fa3cd5a5a48 /trunk/src/createpkg | |
| parent | 92159e709fb7f535bf481599fc406fde1c8ca9db (diff) | |
| download | simplepkg-c46804a91d09ae9d737715dfb14019458bceefa1.tar.gz simplepkg-c46804a91d09ae9d737715dfb14019458bceefa1.tar.bz2 | |
initial support for #41, lots of changes
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@765 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk/src/createpkg')
| -rw-r--r-- | trunk/src/createpkg | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/trunk/src/createpkg b/trunk/src/createpkg index b3b3f97..705b10b 100644 --- a/trunk/src/createpkg +++ b/trunk/src/createpkg @@ -256,6 +256,11 @@ function load_parameters { GPG_AGENT_OPTION="" fi + # For use at common.sh functions + SIGN="$SIGN_PACKAGES" + SIGN_KEYID="$SIGN_PACKAGES_KEYID" + SIGN_USER="$SIGN_PACKAGES_USER" + 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`" @@ -633,7 +638,7 @@ case $1 in exit $EXIT_CODE ;; '--update-keyring') - get_sign_packages_user + get_sign_user repo_gpg_key $PACKAGES_DIR --update if [ $PACKAGES_REPOS_NOARCH -eq $on ]; then repo_gpg_key $NOARCH_DIR --update @@ -773,9 +778,9 @@ if [ $SIGN_PACKAGES -eq $on ]; then echo "Signing package..." - get_sign_packages_user + get_sign_user - if [ ! -z "$SIGN_PACKAGES_USER" ]; then + if [ ! -z "$SIGN_PACKAGES_USER" ] && [ "`whoami`" != "$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 $GPG_AGENT_OPTION --armor -sb -u $SIGN_KEYID -o $tmp_sign_folder/$PKG_NAME.asc $PACKAGES_DIR/$PKG_NAME" |