Merge branch 'master' into ruby

1 files changed, 6 insertions, 0 deletions

diff --git a/keyringer b/keyringer
index 376e2ae..7dde351 100755
--- a/keyringer
+++ b/keyringer
@@ -44,6 +44,12 @@ function keyringer_init {
     if [ -e "$BASEDIR" ]; then
       if [ ! -d "$BASEDIR/keys" ] || [ ! -e "$RECIPIENTS" ]; then
         echo "Invalid keyring $BASEDIR: incomplete installation"
+
+        # A common mistake
+        if [ -d "$BASEDIR/../keys" ]; then
+          echo "You might try `cd $BASEDIR/.. && pwd` instead"
+        fi
+
         exit 1
       fi
     else