diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-12-18 13:10:26 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-12-18 13:10:26 +0000 |
| commit | 1674a633c6948bf1d7bb55c786b78bac6e848f17 (patch) | |
| tree | 4e97662e1c671f0cc88c13a6d9ac444719aa0179 | |
| parent | fd97c72564230603072558eb41c4eb9b5dfde54e (diff) | |
| download | simplepkg-1674a633c6948bf1d7bb55c786b78bac6e848f17.tar.gz simplepkg-1674a633c6948bf1d7bb55c786b78bac6e848f17.tar.bz2 | |
minor fixes
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@680 04377dda-e619-0410-9926-eae83683ac58
| -rw-r--r-- | trunk/lib/common.sh | 2 | ||||
| -rw-r--r-- | trunk/src/createpkg | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh index f1c7794..26c550f 100644 --- a/trunk/lib/common.sh +++ b/trunk/lib/common.sh @@ -1375,9 +1375,9 @@ function check_gnupg { local user="$1" home if [ ! -z "$user" ]; then - echo "Setting up gnupg..." home="`grep "^$user:" /etc/passwd | cut -d : -f 6`" if [ ! -d "$home/.gnupg" ]; then + echo "Setting up gnupg..." su $user -c "gpg --list-keys" fi else diff --git a/trunk/src/createpkg b/trunk/src/createpkg index 60345db..3fe392b 100644 --- a/trunk/src/createpkg +++ b/trunk/src/createpkg @@ -267,6 +267,10 @@ function load_parameters { SIGN_PACKAGES_USER="`eval_parameter SIGN_PACKAGES_USER`" SIGN_PACKAGES_KEYID="`eval_parameter SIGN_PACKAGES_KEYID`" + if [ ! -z "$SIGN_PACKAGES_KEYID" ]; then + SIGN_PACKAGES_KEYID="`echo $SIGN_PACKAGES_KEYID | tr '[:lower:]' '[:upper:]'`" + 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`" |