Usage functions

diff --git a/hydra b/hydra
index f8d695afcc1b9dbba184c7c2115e20384339e7a7..1b80f696597a35faf20407632269a94eab441e02 100755 (executable)
--- a/hydra
+++ b/hydra
@@ -49,7 +49,8 @@ function hydra_load {
   source $APP_BASE/lib/hydra/functions || exit 1
 }
 
-# Basename
+# Name and basename configuration
+NAME="hydra"
 BASENAME="`basename $0`"
 
 # Adjust hydra parameter
@@ -63,7 +64,7 @@ hydra_load $*
 
 # Command-line parser
 if [ -z "$ACTION" ]; then
-  echo "usage: $BASENAME [hydra] <command> [arguments]"
+  hydra_action_usage
   exit 1
 fi
 

diff --git a/lib/hydra/misc b/lib/hydra/misc
index 88ffec16bafdeb5f837c9a45f0257ef94dcf32ae..4695d5fea18c163384160e54e71c05884d093dfb 100644 (file)
--- a/lib/hydra/misc
+++ b/lib/hydra/misc
@@ -70,12 +70,7 @@ function hydra_exec {
 
 # Set needed environment variables and do basic checks.
 function hydra_set_env {
-  if [ -z "$1" ]; then
-    echo "Error: missing arguments for hydra_set_env"
-    exit 1    
-  fi
-
-  ACTION="$1"
+  export ACTION="$1"
 }
 
 # Get a command argument
@@ -100,6 +95,17 @@ function hydra_action_usage {
   fi
 }
 
+# Action dispatcher
 function hydra_dispatch {
   hydra_exec $ACTION $*
 }
+
+# Hydra usage
+function hydra_usage_hydra {
+  echo "Usage: hydra [hydra] <command> [arguments]"
+}
+
+# Hydra ctl usage
+function hydra_usage_hydractl {
+  echo "Usage: hydractl <command> [arguments]"
+}