minor fixes

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@680 04377dda-e619-0410-9926-eae83683ac58

diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh
index f1c7794614f8593386ed470983b236162a5c15be..26c550f77c453d86cc15efefc6d8d366bf381d00 100644 (file)
--- 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 60345dbb957fb516a4930c918bcb465cc797ddde..3fe392b63cd636e24adf1a8d5af9ae8b54257a18 100644 (file)
--- 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`"