feat: code clean up

Author: rugbymauri

commands/_internals/autocomplete.sh

@@ -1,22 +1,19 @@
 
 function _autocomplete() { ## add bash completions
 
-    commands=""
+    commands=()
 
     for commandName in $(compgen -A function | grep "system:"); do
-        commands="${commands} ${commandName}"
+        commands+="${commandName} "
     done
 
-    commands="${commands} project"
     for commandName in $(compgen -A function | grep "project:"); do
-        commands="${commands} ${commandName}"
+        commands+="${commandName} "
     done
 
-    if [ -f ${ROOT_DIR}/dde.local.sh ]; then
-        for commandName in $(compgen -A function | grep ":"); do
-            commands="${commands} ${commandName}"
-        done
-    fi
+    for commandName in $(compgen -A function | grep "local:"); do
+        commands+="${commandName} "
+    done
 
-    echo -n "complete -W '${commands}' dde.sh"
+    echo -n "complete -W '${commands[*]}' dde"
 }

commands/help.sh

@@ -21,20 +21,18 @@ function help() {
 
         _logYellow "System Commands:"
         for commandName in $(compgen -A function | grep "system:"); do
-            echo "   ${commandName:0:${#_functionName}}${_functionName:0:$((${#_functionName} - ${#commandName}))} $(_getFunctionHelp ${commandName} ${DDE_SH})"
+            echo "   ${commandName:0:${#_functionName}}${_functionName:0:$((${#_functionName} - ${#commandName}))} $(_getFunctionHelp ${commandName})"
         done
 
         _logYellow "\nProject Commands:"
         for commandName in $(compgen -A function | grep "project:"); do
-            echo "   ${commandName:0:${#_functionName}}${_functionName:0:$((${#_functionName} - ${#commandName}))} $(_getFunctionHelp ${commandName} ${DDE_SH})"
+            echo "   ${commandName:0:${#_functionName}}${_functionName:0:$((${#_functionName} - ${#commandName}))} $(_getFunctionHelp ${commandName})"
         done
 
-        if [ -f ${ROOT_DIR}/dde.local.sh ]; then
-            _logYellow "\nLocal Commands:"
-            for commandName in $(compgen -A function | grep "local:"); do
-                echo "   ${commandName:0:${#_functionName}}${_functionName:0:$((${#_functionName} - ${#commandName}))} $(_getFunctionHelp ${commandName})"
-            done
-        fi
+        _logYellow "\nLocal Commands:"
+        for commandName in $(compgen -A function | grep "local:"); do
+            echo "   ${commandName:0:${#_functionName}}${_functionName:0:$((${#_functionName} - ${#commandName}))} $(_getFunctionHelp ${commandName})"
+        done
     fi
 }
 

commands/local/command.sh.dist

@@ -8,13 +8,13 @@
 #
 
 function local:command() {
-    echo 'execute local:command'
+    echo "execute local:command"
     _localCommand_someInternalFunction arg1
     _local_someGlobalHelperFunction
 }
 
 function _localCommand_someInternalFunction() {
-    echo "do something with ${1}
+    echo "do something with ${1}"
 }
 
 

commands/system/dde/install/alias.sh

@@ -13,7 +13,7 @@ function system:dde:install:alias() {
         exit 1
     fi
 
-    local _rcLine="alias dde='\$(${ROOT_DIR}/dde.sh'"
+    local _rcLine="alias dde='${ROOT_DIR}/dde.sh'"
 
     if [[ $(cat ${_rcFile} | grep -c "${_rcLine}") -eq 0 ]]; then
         echo "${_rcLine}" >> ${_rcFile}

commands/system/env.sh

@@ -11,9 +11,4 @@ function system:env() {
     echo DOCKER_BUILDKIT=${DOCKER_BUILDKIT}
     echo DDE_UID=${DDE_UID}
     echo DDE_GID=${DDE_GID}
-    echo DDE_SH=${DDE_SH}
-
-    if [ -f ${ROOT_DIR}/dde.local.sh ]; then
-        _logYellow "include: ${ROOT_DIR}/dde.local.sh"
-    fi
 }

dde.sh

@@ -12,7 +12,6 @@ NETWORK_NAME=dde
 DOCKER_BUILDKIT=1
 DDE_UID=$(id -u)
 DDE_GID=$(id -g)
-DDE_SH=${0}
 export DDE_UID
 export DDE_GID