Formatting and more bash colors

aliases

@@ -13,6 +13,8 @@ if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
     GREEN="$(tput setaf 2)"
     YELLOW="$(tput setaf 3)"
     BLUE="$(tput setaf 4)"
+    MAGENTA="$(tput setaf 5)"
+    CYAN="$(tput setaf 6)"
     BOLD="$(tput bold)"
     NORMAL="$(tput sgr0)"
 else
@@ -20,6 +22,8 @@ else
     GREEN=""
     YELLOW=""
     BLUE=""
+    MAGENTA=""
+    CYAN=""
     BOLD=""
     NORMAL=""
 fi

bin/compress-video

@@ -8,6 +8,8 @@ if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
     GREEN="$(tput setaf 2)"
     YELLOW="$(tput setaf 3)"
     BLUE="$(tput setaf 4)"
+    MAGENTA="$(tput setaf 5)"
+    CYAN="$(tput setaf 6)"
     BOLD="$(tput bold)"
     NORMAL="$(tput sgr0)"
 else
@@ -15,6 +17,8 @@ else
     GREEN=""
     YELLOW=""
     BLUE=""
+    MAGENTA=""
+    CYAN=""
     BOLD=""
     NORMAL=""
 fi

bin/sync-android-chrome-tabs

@@ -8,6 +8,8 @@ if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
     GREEN="$(tput setaf 2)"
     YELLOW="$(tput setaf 3)"
     BLUE="$(tput setaf 4)"
+    MAGENTA="$(tput setaf 5)"
+    CYAN="$(tput setaf 6)"
     BOLD="$(tput bold)"
     NORMAL="$(tput sgr0)"
 else
@@ -15,6 +17,8 @@ else
     GREEN=""
     YELLOW=""
     BLUE=""
+    MAGENTA=""
+    CYAN=""
     BOLD=""
     NORMAL=""
 fi

osx/install

@@ -8,6 +8,8 @@ if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
     GREEN="$(tput setaf 2)"
     YELLOW="$(tput setaf 3)"
     BLUE="$(tput setaf 4)"
+    MAGENTA="$(tput setaf 5)"
+    CYAN="$(tput setaf 6)"
     BOLD="$(tput bold)"
     NORMAL="$(tput sgr0)"
 else
@@ -15,6 +17,8 @@ else
     GREEN=""
     YELLOW=""
     BLUE=""
+    MAGENTA=""
+    CYAN=""
     BOLD=""
     NORMAL=""
 fi

osx/pre_install

@@ -8,6 +8,8 @@ if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
     GREEN="$(tput setaf 2)"
     YELLOW="$(tput setaf 3)"
     BLUE="$(tput setaf 4)"
+    MAGENTA="$(tput setaf 5)"
+    CYAN="$(tput setaf 6)"
     BOLD="$(tput bold)"
     NORMAL="$(tput sgr0)"
 else
@@ -15,6 +17,8 @@ else
     GREEN=""
     YELLOW=""
     BLUE=""
+    MAGENTA=""
+    CYAN=""
     BOLD=""
     NORMAL=""
 fi

script_helpers/file_ops.sh

@@ -21,7 +21,6 @@ expand_path() {
             ret="$ret/${parts[$i]}"
         done
     fi
-
     ret=$(readlink -m "$ret")
     echo $ret
 }
@@ -200,7 +199,7 @@ link_file() {
     fi
 
     if [[ $require_confirmation -eq 1 ]]; then
-        echo "${BOLD}${BLUE}Will attempt to link ${GREEN}$source_path${BLUE} to ${GREEN}$dest_path${BLUE}"
+        echo "${BOLD}${BLUE}Will attempt to link ${YELLOW}$source_path${BLUE} to ${YELLOW}$dest_path${BLUE}"
         printf "${BOLD}Enter 1 to proceed\n${YELLOW}> ${NORMAL}"
         read confirm
         if [[ $confirm != 1 ]]; then abort; fi
@@ -212,7 +211,7 @@ link_file() {
         echo Link cmd:: $link_cmd
     fi
 
-    printf "${BOLD}*${NORMAL} ${YELLOW}Linking '$source_path'${NORMAL} to ${YELLOW}'$dest_path'${NORMAL}\n"
+    printf "${BOLD}${GREEN}==> ${NORMAL}Linking ${BOLD}${YELLOW}'$source_path'${NORMAL} to ${BOLD}${YELLOW}'$dest_path'${NORMAL}\n"
     eval $link_cmd
 }
 
@@ -222,7 +221,7 @@ function setup_file() {
     if [ ! -f $dest ]; then
         link_file $src $dest $confirm_link
     else
-        printf "${BOLD}*${NORMAL} ${YELLOW}'$dest'${NORMAL} already linked to ${YELLOW}'$src'${NORMAL}\n"
+        printf "${BOLD}${MAGENTA}==> ${NORMAL}${BOLD}${YELLOW}'$dest'${NORMAL} already linked to ${BOLD}${YELLOW}'$src'${NORMAL}\n"
     fi
 }
 
@@ -232,7 +231,7 @@ function setup_dir() {
     if [ ! -d $dest ]; then
         link_file $src $dest $confirm_link
     else
-        printf "${BOLD}*${NORMAL} ${YELLOW}'$dest'${NORMAL} already linked to ${YELLOW}'$src'${NORMAL}\n"
+        printf "${BOLD}${MAGENTA}==> ${NORMAL}${BOLD}${YELLOW}'$dest'${NORMAL} already linked to ${BOLD}${YELLOW}'$src'${NORMAL}\n"
     fi
 }
 

script_helpers/printing.sh

@@ -8,6 +8,8 @@ if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
     GREEN="$(tput setaf 2)"
     YELLOW="$(tput setaf 3)"
     BLUE="$(tput setaf 4)"
+    MAGENTA="$(tput setaf 5)"
+    CYAN="$(tput setaf 6)"
     BOLD="$(tput bold)"
     NORMAL="$(tput sgr0)"
 else
@@ -15,6 +17,8 @@ else
     GREEN=""
     YELLOW=""
     BLUE=""
+    MAGENTA=""
+    CYAN=""
     BOLD=""
     NORMAL=""
 fi

vim/templates/skeleton.sh

@@ -8,6 +8,8 @@ if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
     GREEN="$(tput setaf 2)"
     YELLOW="$(tput setaf 3)"
     BLUE="$(tput setaf 4)"
+    MAGENTA="$(tput setaf 5)"
+    CYAN="$(tput setaf 6)"
     BOLD="$(tput bold)"
     NORMAL="$(tput sgr0)"
 else
@@ -15,6 +17,8 @@ else
     GREEN=""
     YELLOW=""
     BLUE=""
+    MAGENTA=""
+    CYAN=""
     BOLD=""
     NORMAL=""
 fi
@@ -35,7 +39,7 @@ cwd=$PWD
 uname_s="$(uname -s)"
 case "${uname_s}" in
     Linux*)   machine=Linux;;
-    Darwin*)  machine=Mac;;
+    Darwin*)  machine=MacOS;;
     CYGWIN*)  machine=Cygwin;;
     MINGW*)   machine=MinGw;;
     *)        machine="UNKNOWN:${uname_s}"