From de1cf96a45e871939d1cbe60fabeea94cc02b49a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Di=20Gr=C3=A9gorio?= <dig@p2p.legal>
Date: Mon, 2 Jul 2018 23:01:21 +0200
Subject: [PATCH] task dont parse options anymore, and taskrc file typo
 corrected

---
 tasks/.taskrc | 26 ++++++++++++++++----------
 tasks/task    | 20 ++++++--------------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/tasks/.taskrc b/tasks/.taskrc
index d6ce1fb..a906438 100644
--- a/tasks/.taskrc
+++ b/tasks/.taskrc
@@ -22,10 +22,10 @@ $(read -r -p Need\ some\ infos\ for\ task\ $TASK_NAME\ \(\ \hit\ enter\ \)\  v)
 ##
 ##
 
-# write tour default options here
+# write your default options here
 
 source easyoptions || exit
-verbose() { [[ -n "$verbose" ]] && echo $1; }
+verbose() { [[ -n "\$verbose" ]] && echo \$1; }
 
 ##### YOUR CODE HERE #####
 
@@ -64,17 +64,23 @@ verbose() { [[ -n "$verbose" ]] && echo $1; }
 
 
 ################################################################################
-__dirname="$(dirname $0)"
-__dirtask="$__dirname/.$(basename $0)"
+__dirname="\$(dirname \$0)"
+__dirtask="\$__dirname/.\$(basename \$0)"
+__taskargs=\$(echo "\${@:1}" | sed "s/\${arguments[0]} //")
+
 
 # Calls command (1rt argument) as script or function \$1( \$2 \$3 ... )
-if [ -r "$__dirtask/$1" ]
-        verbose "Command file exists call it: \$__dirtask/\$1 \${*:2}"
-        \$__dirtask/\$1 \${*:2}
+if [ -r "\$__dirtask/\${arguments[0]}" ]
+then
+        verbose "Command file exists call it: \$__dirtask/\${arguments[0]} \$__taskargs"
+        \$__dirtask/\${arguments[0]} \$__taskargs
 else
-        if [ -n "$(type -t $1)" ] && [ "$(type -t $1)" = function ];
+        if [ -n "\$(type -t \${arguments[0]})" ] && [ "\$(type -t \${arguments[0]})" = function ];
         then
-                verbose "\$__dirtask/\$1 not exists try func:  \$1 \${*:2}"
-                \$1 "\${*:2}"
+                verbose "\$__dirtask/\${arguments[0]} do not exists, trying function:  \${arguments[0]} \$__taskargs"
+                \${arguments[0]} \$__taskargs
         fi
 fi
+
+
+
diff --git a/tasks/task b/tasks/task
index e685978..9ff804a 100644
--- a/tasks/task
+++ b/tasks/task
@@ -28,8 +28,8 @@
 # defaults ex: (uncomment)
 #option1=coucou
 
-source easyoptions || exit
-verbose() { [[ -n "$verbose" ]] && echo $1; }
+#source easyoptions || exit
+#verbose() { [[ -n "$verbose" ]] && echo $1; }
 
 
 
@@ -49,20 +49,12 @@ create()
 }
 
 
-if [ -n "$verbose" ]
-then
-        # Arguments
-        for argument in "${arguments[@]}"; do
-            echo "Argument specified: $argument"
-        done
-fi
-
-
-[[ -n "$create" ]] && create ${arguments[@]}
-
+# Boolean and parameter options
+[[ $1 == "--create" ]] && create ${@:2}
+[[ $1 == "-c" ]] && create ${@:2}
 
 
 ################################################################################
 
-# Calls command (1rt argument) as function \$1( \$2 \$3 ... )
+# Calls command (1rt argument) as function $1( $2 $3 ... )
 $PWD/.tasks/$1 ${@:2}