task bugfix

cbuild.sh

@@ -20,12 +20,6 @@ function include {
     . "$script_path"
 }
 
-function include_if_not_null {
-    if [ ! -z "$1" ]; then
-        include "$1"
-    fi
-}
-
 include "cbuild/myprint.sh"
 include "cbuild/functions.sh"
 include "cbuild/config.sh"
@@ -103,27 +97,29 @@ function call_task {
     local task="$3"
 
     print_header "${CYAN}" "─" "$task"
-    load_config "$task" "$current_config_path" "$default_config_path"
+    load_config "$current_config_path" "$default_config_path" "$task"
     resolve_dependencies "$DEPS_BASEDIR" "$DEPS"
 
-    myprint "${BLUE}executing $PRE_TASK_SCRIPT"
-    # include_if_not_null "$PRE_TASK_SCRIPT"
+    if [ ! -z "$PRE_TASK_SCRIPT" ]; then
+        myprint "${BLUE}executing ${WHITE}$TASK_SCRIPT"
+        include "$PRE_TASK_SCRIPT"
+    fi
 
-    myprint "${BLUE}executing $TASK_SCRIPT"
-    # include "$TASK_SCRIPT"
+    myprint "${BLUE}executing ${WHITE}$TASK_SCRIPT"
+    include "$TASK_SCRIPT"
 
-    myprint "${BLUE}executing $POST_TASK_SCRIPT"
-    # include_if_not_null "$POST_TASK_SCRIPT"
-    myprint "error"
+    if [ ! -z "$POST_TASK_SCRIPT" ]; then
+        myprint "${BLUE}executing ${WHITE}$POST_TASK_SCRIPT"
+        include "$POST_TASK_SCRIPT"
+    fi
 }
 
 function call_tasks {
     local tasks="$@"
-    myprint "$tasks"
-    
+    load_config "$current_config_path" "$default_config_path"
     print_header "${WHITE}" "═" "$PROJECT"
     for task in $tasks ; do
-        call_task  "$task"
+        call_task "$current_config_path" "$default_config_path" "$task"
     done
     print_hline "${WHITE}" "═"
 }