From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 10 Dec 2013 19:36:04 +0000 (-0200)
Subject: Run shell by default (#34)
X-Git-Tag: 0.3~25
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=f58aac98a069c694d2a5791eb96a7554af6b798f;p=keyringer.git

Run shell by default (#34)
---

diff --git a/keyringer b/keyringer
index 33d19ff..9c45d97 100755
--- a/keyringer
+++ b/keyringer
@@ -162,12 +162,14 @@ source "$LIB" || exit 1
 # Setup main configuration and load preferences
 keyringer_config_load
 
-if [ -z "$ACTION" ]; then
+# Dispatch
+if [ -z "$KEYRING" ]; then
   keyringer_usage
   exit 1
-fi
-
-if [ "$ACTION" == "init" ]; then
+elif [ -z "$ACTION" ]; then
+  # Run shell if no action were given
+  keyringer $KEYRING shell
+elif [ "$ACTION" == "init" ]; then
   keyringer_init $*
 elif keyringer_has_action "$ACTION"; then
   keyringer_dispatch $*
diff --git a/lib/keyringer/actions/shell b/lib/keyringer/actions/shell
index 955dfe8..ab170b1 100755
--- a/lib/keyringer/actions/shell
+++ b/lib/keyringer/actions/shell
@@ -10,6 +10,9 @@ source "$LIB" || exit 1
 # Basic parameters
 SHELLPATH="/"
 
+# Show usage
+keyringer_usage $KEYRING
+
 # While a "quit" command isn't entered, read STDIN
 while read -rep "keyringer:/${KEYRING}${SHELLPATH}> " STDIN; do
   if [ "$STDIN" == "quit" ] || [ "$STDIN" == "exit" ] || [ "$STDIN" == "bye" ]; then