2 files changed, 14 insertions(+), 7 deletions(-)

M README.md
M keyring

@@ 41,12 41,12 @@ contribute.
 Put the following lines into a shell resource file which gets sourced one time,
 eg. `~/.zlogin`, `~/.bash_login`, `~/.profile`, `~/.xinitrc`, ...
 
-    eval `keyring --add ~/.ssh/foo_key ~/.ssh/bar_key ~/.ssh/baz_key`
+    eval `keyring --eval --add ~/.ssh/foo_key ~/.ssh/bar_key ~/.ssh/baz_key`
 
 If you need Your keys in every shell session put the following line into
 Your default resource file, eg. `~/.bashrc´, `~./.zshrc`, ...
 
-    eval `keyring`
+    eval `keyring --eval`
 
 Below are all customizable environmental variables with their default values:
 


@@ 58,7 58,7 @@ And here is an example how to adjust and submit those values.
 
     eval ` \
     PASS_KEY_PREFIX='foo' \
-    keyring`
+    keyring --eval`
 
 ### Your Keyring Database
 

@@ 54,14 54,18 @@ then
     echo "SSH_ASKPASS=$0; export SSH_ASKPASS;" >> "$SSH_INFO_FILE"
     _source_ssh_info
 fi
-
-[ $# -eq 0 ] && print_exports && exit 0
 [ $INIT -eq 1 ] && sleep 1
 # }}}
 
+[ $# -eq 0 ] && exit 0
+
 # options {{{
+if [ "$1" = '--eval' ] || [ "$1" = '-e' ]; then
+    shift
+    print_exports
+fi
+
 if [ "$1" = '--add' ] || [ "$1" = '-a' ]; then
-    [ $INIT -eq 1 ] && print_exports
     if [ $# -gt 1 ]; then
         shift
         echo "keyring +" >&2


@@ 69,6 73,7 @@ if [ "$1" = '--add' ] || [ "$1" = '-a' ]; then
         exit $?
     fi
     echo "ArgumentError: missing keys" >&2
+    exit 1
 fi
 
 if [ "$1" = '--clear' ] || [ "$1" = '-c' ]; then


@@ 101,7 106,9 @@ cat <<EOF
 keyring + https://git.christoph-polcin.com/keyring
 
 Usage:
-    keyring -a [--add] <KEY-PATH ...>
+    keyring -e [--eval] [ARGS]
+        foo
+    keyring -a [--add] keys...
         foo
     keyring -c [--clear]
         foo