summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-02-20 15:16:43 -0300
committerSilvio Rhatto <rhatto@riseup.net>2017-02-20 15:16:43 -0300
commit192c50775776887bfc16cb64dc5e4d6cbc25abd6 (patch)
tree001db931714ac4f2d4e42437c3dedd7a679539be
parent1267fa1fe50dd9286bad294e674809479d03e68d (diff)
downloadhydra-192c50775776887bfc16cb64dc5e4d6cbc25abd6.tar.gz
hydra-192c50775776887bfc16cb64dc5e4d6cbc25abd6.tar.bz2
Fixes ACTION handling
-rwxr-xr-xhydra3
-rw-r--r--lib/hydra/misc4
2 files changed, 3 insertions, 4 deletions
diff --git a/hydra b/hydra
index da78bc6..51c1468 100755
--- a/hydra
+++ b/hydra
@@ -57,7 +57,10 @@ export NAME="$BASENAME"
# Adjust hydra parameter
if [ "$BASENAME" == "hydra" ]; then
export HYDRA="$1"
+ export ACTION="$2"
shift
+else
+ export ACTION="$1"
fi
# Load
diff --git a/lib/hydra/misc b/lib/hydra/misc
index a3156a7..f086fb7 100644
--- a/lib/hydra/misc
+++ b/lib/hydra/misc
@@ -7,10 +7,6 @@ function hydra_set_env {
export COMMIT="`( cd $APP_BASE && git log -n 1 --pretty=oneline 2> /dev/null | cut -d " " -f 1 )`"
export CONFIG="$HOME/.hydra/config"
- if [ -z "$ACTION" ]; then
- export ACTION="$1"
- fi
-
if [ "`whoami`" != 'root' ]; then
SUDO="sudo"
fi