Fixing some zsh functions

zsh/functions/auto-ls-custom_function

@@ -0,0 +1,6 @@
+#!/usr/bin/env zsh
+
+function auto-ls-custom_function() {
+    echo -e "\nauto-ls-custom_function:\n"
+    exa -GxFa --icons --group-directories-first --no-filesize --no-user
+}

zsh/functions/caller

@@ -21,6 +21,6 @@ function caller() {
             fi
         done
 
-        printf "${_stack}${_reset_color}"
+        printf " ${_stack}${_reset_color}"
     fi
 }

zsh/functions/chmod_reset

@@ -1,28 +1,33 @@
 #!/usr/bin/env zsh
 
 function chmod_reset() {
-    [ -z "$1" ] && echo "path is required" && \
-        return 1 || \
-        log start "resetting permissions on '$1'... "
+    # shell_debug_relay=$SHELL_DEBUG
+    # SHELL_DEBUG=true
 
-    /usr/bin/sudo chown -R "$USER:$USER" "$1"
-    /usr/bin/sudo chmod -R 644 "$1"
-    /usr/bin/sudo find "$1" -type d -exec chmod +x {} \;
+    $SHELL_DEBUG && set -x
+
+    sudo chmod -cR 600 $1
+    sudo chmod -R u+X $1
+    sudo chown -cR $USER:$USER $1
 
     patterns=(
         "*.AppImage"
         "*.py"
         "*.sh"
-        "setup"
-        "start"
-        "install"
-        "pre-install"
+        "/bin/"
         "install-pristine"
+        "install"
         "post-install"
+        "post-setup"
+        "pre-install"
+        "pre-setup"
+        "setup"
+        "start"
     )
     for p in "${patterns[@]}"; do
-        find "$1" -name "$p" -exec chmod +x {} \;
+        sudo find "$1" -name "$p" -exec sudo chmod u+x {} \;
     done
 
-    echo "done"
+    # SHELL_DEBUG=$shell_debug_relay
+    $SHELL_DEBUG && set +x
 }

zsh/functions/db_migrate

@@ -1,6 +1,6 @@
 #!/usr/bin/env zsh
 
-function db_migrate () {
+function db_migrate() {
     DOCKER_IMAGE_NAME=renatovico/simple-db-migrate
     docker build https://raw.githubusercontent.com/renatovico/simple-db-migrate-docker/master/Dockerfile -t ${DOCKER_IMAGE_NAME}:latest
     echo "params to use in database ${1}:"

zsh/functions/dropbox_sync

@@ -6,12 +6,12 @@ function dropbox_sync() {
     echo -e "running dropbox-worker..."
     notify-send "dropbox-worker" "running..."
 
-    dropbox start
+    dropbox.py start
 
     echo -e "giving $wait_for to dropbox work..."
     sleep $wait_for
 
-    dropbox stop
+    dropbox.py stop
 
     echo -e "finish dropbox-worker"
     notify-send "dropbox-worker" "finish"

zsh/functions/emoji_random

@@ -1,6 +1,6 @@
 #!/usr/bin/env zsh
 
-function emoji_random () {
+function emoji_random() {
     local SELECTED_EMOJIS=(
         💩
         🐦

zsh/functions/extract

@@ -6,7 +6,7 @@
 # Note: .dmg/hdiutil is macOS-specific.
 #
 # credit: http://nparikh.org/notes/zshrc.txt
-function extract () {
+function extract() {
     if [ -f $1 ]; then
         case $1 in
             *.tar.bz2)  tar -jxvf $1                        ;;

zsh/functions/iterate_and_load

@@ -10,10 +10,10 @@ function iterate_and_load() {
 
     local cmd="find $find_path -name '$find_term' -print 2>/dev/null | $filter_fn"
 
-    log_debug "$cmd"
+    log debug "$cmd"
 
     eval "$cmd" | while read -r script_file; do
-        log_debug "$script_file"
+        log debug "$script_file"
         # shellcheck source=/dev/null
         . "$script_file"
     done

zsh/functions/log

@@ -1,18 +1,19 @@
 #!/usr/bin/env zsh
 
-# shellcheck source=/dev/null
-. "${DOTFILES}/zsh/init/20_colors.zsh"
-
 function log() {
     level=$1
+
+    silenced_levels=("debug" "start" "finish")
+
+    if ! $SHELL_DEBUG; then
+        if [[ ${silenced_levels[@]} =~ $level ]]; then
+            return
+        fi
+    fi
+
     shift
-    . "${DOTFILES}/zsh/functions/log_debug"
-    . "${DOTFILES}/zsh/functions/log_echo"
-    . "${DOTFILES}/zsh/functions/log_error"
-    . "${DOTFILES}/zsh/functions/log_finish"
-    . "${DOTFILES}/zsh/functions/log_info"
-    . "${DOTFILES}/zsh/functions/log_is_command_success"
-    . "${DOTFILES}/zsh/functions/log_start"
-    . "${DOTFILES}/zsh/functions/log_warn"
+
+    . "${DOTFILES}/zsh/functions/caller"
+
     eval "log_$level '$@'"
 }

zsh/functions/log_debug

@@ -1,5 +1,5 @@
 #!/usr/bin/env zsh
 
 function log_debug() {
-    log_echo "🐞" "${GREY}" "$@"
+    log_echo "🐞 ${GREY} $@ ${NC}"
 }

zsh/functions/log_echo

@@ -1,22 +1,11 @@
 #!/usr/bin/env zsh
 
 function log_echo() {
-    $SHELL_DEBUG || return
+    local fn_called
+    fn_called="$0"
 
-    local shell
-    shell="$0"
-
-    local icon
-    icon="$1"
-
-    shift
-
-    local color
-    color="$1"
-
-    shift
-
-    [ -n "$icon" ] && icon="$icon "
+    local msg
+    msg="$1"
 
     local loutput=0
     local lcaller=0
@@ -28,7 +17,7 @@ function log_echo() {
 
     $SHELL_TRACE && _caller=$(caller)
 
-    local output="${icon}${color} $@ ${NC}"
+    local output=$msg
 
     if ! command -v ansi2txt &>/dev/null; then
         echo -e "${RED} you need to install colorized-logs package: ${NC}"
@@ -39,16 +28,16 @@ function log_echo() {
     fi
 
     if [[ $cols -ge 80 ]]; then
-        loutput=$(echo "${output}" | ansi2txt | wc -L)
+        loutput=$(echo " +++ ${output}" | ansi2txt | wc -L)
 
         if [[ $loutput -gt $cols ]]; then
             loutput=$(($loutput-$cols))
         fi
 
         rpad=$(($cols-$loutput))
-        lcaller=$(echo "${_caller}" | ansi2txt | wc -L)
+        lcaller=$(echo "  ---  ${_caller}" | ansi2txt | wc -L)
         rpad=$(($rpad-$lcaller))
-        if [[ "$shell" =~ "zsh" ]]; then
+        if [[ "$fn_called" =~ "zsh" ]]; then
             space=${(l:$rpad:: :)}
         fi
     fi

zsh/functions/log_error

@@ -1,5 +1,5 @@
 #!/usr/bin/env zsh
 
 function log_error() {
-    log_echo "💣" "$RED" "$@"
+    log_echo "💣 ${RED} $@ ${NC}"
 }

zsh/functions/log_finish

@@ -1,5 +1,5 @@
 #!/usr/bin/env zsh
 
 function log_finish() {
-    log_echo "🛑" "$PURPLE" "$@" "was finished ⏱️ $(date +"%H:%M:%S.%3N")"
+    log_echo "🛑 $@ was finished at $(date +"%H:%M:%S.%3N") ⏱️ "
 }

zsh/functions/log_info

@@ -1,5 +1,5 @@
 #!/usr/bin/env zsh
 
 function log_info() {
-    log_echo "💬" "$CYAN" "$@"
+    log_echo "💬 ${CYAN} $@ ${NC}"
 }

zsh/functions/log_start

@@ -1,5 +1,5 @@
 #!/usr/bin/env zsh
 
 function log_start() {
-    log_echo "🚦" "$PURPLE" "starting $@... ⏱️ $(date +"%H:%M:%S.%3N")"
+    log_echo " 🚦 starting $@ at $(date +"%H:%M:%S.%3N") ⏱️ "
 }

zsh/functions/log_warn

@@ -1,5 +1,5 @@
 #!/usr/bin/env zsh
 
 function log_warn() {
-    log_echo "🚧" "$YELLOW" "$@"
+    log_echo "🚧 ${YELLOW} $@ ${NC}"
 }

zsh/functions/ls_2_exa

@@ -4,5 +4,5 @@ function ls_2_exa() {
     command -v exa &> /dev/null || sudo apt-get install exa
     args="$@"
     args=$(echo $args | sed 's/A/a/g')
-    eval "exa $args"
+    eval "/usr/bin/exa --all --oneline --long --classify --icons --color always --group-directories-first --header --octal-permissions $args"
 }

zsh/functions/sudo

@@ -10,7 +10,7 @@ function sudo() {
 		"$@"
 	else
 		if ! env sudo --non-interactive true 2>/dev/null; then
-			log_warn "Root privileges are being requested. Pay attention to what you are doing!"
+			log warn "root privileges are being requested. pay attention to what you are doing!"
 			env sudo --validate
 		fi
 		env sudo "$@"

zsh/functions/zsh_plugins_install

@@ -1,7 +1,10 @@
 #!/usr/bin/env zsh
 
 function zsh_plugins_install() {
-    shell_debug_relay=$SHELL_DEBUG
+    echo "zsh_plugins_install is DEPRECATED, using zplug"
+    return
+
+    # shell_debug_relay=$SHELL_DEBUG
     # SHELL_DEBUG=true
 
     local _zsh_plugins_list=($(zsh_plugins_list))
@@ -18,8 +21,8 @@ function zsh_plugins_install() {
         else
             output+="already installed"
         fi
-        log_info "$output"
+        log info "$output"
     done
 
-    SHELL_DEBUG=$shell_debug_relay
+    # SHELL_DEBUG=$shell_debug_relay
 }

zsh/functions/zsh_plugins_load

@@ -1,12 +1,15 @@
 #!/usr/bin/env zsh
 
 function zsh_plugins_load() {
+    echo "zsh_plugins_load is DEPRECATED, using zplug"
+    return
+
     log start "zsh_plugins_load()"
 
     plugins_path="${ZSH_CUSTOM}/plugins"
 
     find "$plugins_path" -mindepth 3 -maxdepth 3 -name "*.plugin.zsh" | while read -r item; do
-        log_debug $item
+        log debug $item
         . "$item"
     done
 }