summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-11-14 14:19:50 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-11-14 14:19:50 -0200
commita91806756a29838124afa828396c3db671df035c (patch)
treec086b7e59e0db5fa88f4c5fb42abc63c344eafc7
parentfefbd3d64fdc02a4e4dc55bf90b9e9f91a397804 (diff)
downloadhydra-a91806756a29838124afa828396c3db671df035c.tar.gz
hydra-a91806756a29838124afa828396c3db671df035c.tar.bz2
Usage enhancements
-rwxr-xr-xhydra2
-rw-r--r--lib/hydra/misc5
-rwxr-xr-xshare/hydra/deploy2
3 files changed, 6 insertions, 3 deletions
diff --git a/hydra b/hydra
index 53c4a64..da78bc6 100755
--- a/hydra
+++ b/hydra
@@ -51,8 +51,8 @@ function hydra_load {
}
# Name and basename configuration
-NAME="hydra"
BASENAME="`basename $0`"
+export NAME="$BASENAME"
# Adjust hydra parameter
if [ "$BASENAME" == "hydra" ]; then
diff --git a/lib/hydra/misc b/lib/hydra/misc
index d83afbb..b349b40 100644
--- a/lib/hydra/misc
+++ b/lib/hydra/misc
@@ -108,8 +108,11 @@ function hydra_action_usage {
hydra_usage_$BASENAME
else
# Default usage
- echo "Usage: hydra|hydractl <command> [arguments]"
+ echo "Usage: $NAME <command> [arguments]"
fi
+
+ echo "Available commands:"
+ ls $ACTIONS | sed -e 's/^/\t/'
}
# Action dispatcher
diff --git a/share/hydra/deploy b/share/hydra/deploy
index 2454bc6..108f38c 100755
--- a/share/hydra/deploy
+++ b/share/hydra/deploy
@@ -9,7 +9,7 @@ hydra_config_load
# Command line arguments
NODES="$*"
-COMMIT="347cca10fef9263bf1dd75b34123ec839de7166b"
+COMMIT="fefbd3d64fdc02a4e4dc55bf90b9e9f91a397804"
# Build node list
if [ -z "$NODES" ]; then