aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--trunk/lib/common.sh2
-rw-r--r--trunk/src/createpkg4
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`"