5 scripts

+update colors strings +update parameter ‘—nodistract’
node.sh install.sh
2021-01-09 15:05:29 +01:00 · 2021-01-09 14:13:24 +01:00 · 2021-01-09 14:12:29 +01:00 · 2021-01-09 13:04:07 +01:00 · 2021-01-09 13:03:03 +01:00 · 2021-01-09 13:00:28 +01:00
9 changed files with 608 additions and 632 deletions
--- a/README.md
+++ b/README.md
@@ -25,13 +25,13 @@ homebrew and pecl plugins notifie you if apache/php configuration files have bee
 ## Requirements

 - [Homebrew](https://brew.sh/)
+- [jq](https://github.com/stedolan/jq) *(brew install jq)* for processing JSON data (homebrew plugin)

 Optionnal:

 - [pipdeptree](https://pypi.python.org/pypi/pipdeptree) *(pip install pipdeptree)* for checking dependancies (pip plugin)
- [jq](https://github.com/stedolan/jq) *(brew install jq)* for processing JSON data (homebrew plugin)
 - [terminal-notifier](https://github.com/julienXX/terminal-notifier) *(brew install terminal-notifier)* for sending macOS notification (all plugins)
- [Bash 5](https://www.gnu.org/software/bash/) *(brew install bash)* for associative array (homebrew plugin)
+- ~~[Bash 5](https://www.gnu.org/software/bash/) *(brew install bash)* for associative array (homebrew plugin)~~ (homebrew plugin 2.0)



--- a/install.sh
+++ b/install.sh
@@ -8,7 +8,7 @@ reset="\033[0m"
 KYMSU_PATH=`pwd`

 # Make Kymsu accessible in PATH
-echo -e "Installing ${bold}kymsu2${reset} in ${bold}/usr/local/bin${reset} ..."
+echo -e "\nInstalling ${bold}kymsu2${reset} in ${bold}/usr/local/bin${reset} ..."
 ln -fs "${KYMSU_PATH}"/kymsu2.sh /usr/local/bin/kymsu2

 # Store Kymsu stuff in home directory
--- a/plugins.d/antibody.sh
+++ b/plugins.d/antibody.sh
@@ -15,8 +15,9 @@ display_info=true
 # Also add package for prevent to update whitout pin it.
 declare -a do_not_update=('')

-# No distract mode (no user interaction)(Casks with 'latest' version number won't be updated)
-no_distract=false
+# No distract mode (no user interaction)
+[[ $@ =~ "--nodistract" ]] && no_distract=true || no_distract=false
+
 #
 ###############################################################################################
 #
@@ -26,6 +27,15 @@ no_distract=false
 #
 ###############################################################################################

+italic="\033[3m"
+underline="\033[4m"
+ita_under="\033[3;4m"
+bgd="\033[1;4;31m"
+red="\033[1;31m"
+bold="\033[1m"
+box="\033[1;41m"
+reset="\033[0m"
+
 notification() {
    sound="Basso"
    title="Antibody"
@@ -42,14 +52,12 @@ notification() {
 }


-if [[ $1 == "--nodistract" ]]; then
-	no_distract=true
-fi
-
-echo -e "\033[1m🙏 Antibody \033[0m"
-echo ""
-
 antibody_folder=$(antibody home)
+antibody_version=$(antibody -v 2>&1 | awk '{print $3}')
+
+echo -e "${bold}🙏 Antibody ${reset}\n"
+
+echo -e "Current ${underline}Antibody${reset} version: $antibody_version\n"

 update=$(antibody update 2>&1)

@@ -57,7 +65,7 @@ installed=$(echo "$update" | grep "updating")
 updated=$(echo "$update" | grep "updated")

 if [ -n "$installed" ]; then
-	echo -e "\033[4mAntibody modules installed:\033[0m"
+	echo -e "${underline}Antibody modules installed:${reset}"
 	#echo "$installed"

 	IFS=$'\n'
@@ -66,16 +74,18 @@ if [ -n "$installed" ]; then
 	do
 		url=$(echo "$i" | awk '{print $3}')
 		module=$(echo "$i" | awk -F "/" '{print $NF}')
-		echo -e "\033[1m$module\033[0m ($url)"
+		echo -e "${bold}$module${reset} ($url)"
 	done
 	
 	echo ""
 	echo "Modules are installed in $antibody_folder folder."
 else
-	echo -e "\033[4mNo Antibody modules installed.\033[0m"
+	echo -e "${underline}No Antibody modules installed.${reset}"
 fi

 <<COMMENT
+antibody update:
+
 antibody: updating: https://github.com/zsh-users/zsh-history-substring-search
 antibody: updating: https://github.com/zsh-users/zsh-completions
 antibody: updating: https://github.com/zsh-users/zsh-autosuggestions
@@ -88,7 +98,7 @@ COMMENT
 echo ""

 if [ -n "$updated" ]; then
-	echo -e "\033[4mAntibody modules to update:\033[0m"
+	echo -e "${underline}Antibody modules to update:${reset}"
 	#echo "$updated"

 	IFS=$'\n'
@@ -98,20 +108,18 @@ if [ -n "$updated" ]; then
 		module=$(echo "$j" | awk -F "/" '{print $NF}' | awk '{print $1}')
 		commit=$(echo "$j" | awk -F "$url" '{print $NF}')
 		last_commit=$(echo "$commit" | awk '{print $NF}')
-		echo -e "\033[1m$module\033[0m ($url)"
+		echo -e "${bold}$module${reset} ($url)"
 		echo "Commits: $commit"
 		echo "Last commit: "$url"/commits/"$last_commit
 		# https://github.com/zsh-users/zsh-completions/commits/
 		
-		#notif="$module has been updated"
-		#notification "$notif"
 		modules+="$module "
 	done
 	notif="$modules has been updated"
 	notification "$notif"

 else
-	echo -e "\033[4mNo Antibody modules to update.\033[0m"
+	echo -e "${underline}No Antibody modules to update.${reset}"
 	echo ""	
 fi

--- a/plugins.d/gem.sh
+++ b/plugins.d/gem.sh
@@ -5,13 +5,20 @@
 # https://guides.rubygems.org/what-is-a-gem/

 # No distract mode
-no_distract=false
+[[ $@ =~ "--nodistract" ]] && no_distract=true || no_distract=false

-if [[ $1 == "--nodistract" ]]; then
-	no_distract=true
-fi
+italic="\033[3m"
+underline="\033[4m"
+ita_under="\033[3;4m"
+bold="\033[1m"
+bold_under="\033[1;4m"
+redbox="\033[1;41m"
+redbold="\033[1;31m"
+red="\033[31m"
+yellow="\033[33m"
+reset="\033[0m"

-echo -e "\033[1m 💍  Gem (Ruby) \033[0m"
+echo -e "${bold} 💍  Gem (Ruby) ${reset}"

 echo ""

@@ -21,7 +28,7 @@ upd=$(echo "$gem_outdated" | awk '{print $1}')
 if [ -n "$upd" ]; then
 	nb=$(echo "$upd" | wc -w | xargs)
 	
-	echo -e "\\033[1;41m $nb \033[0m \033[4mavailables updates:\033[0m"
+	echo -e "${redbox} $nb ${reset} ${underline}availables updates:${reset}"
 	echo "$gem_outdated"
 	echo ""
 	
@@ -38,5 +45,5 @@ if [ -n "$upd" ]; then
 			fi
 		done	
 else
-	echo -e "\033[4mNo gem updates.\033[0m"
+	echo -e "${underline}No gem updates.${reset}"
 fi
--- a/plugins.d/homebrew.sh
+++ b/plugins.d/homebrew.sh
@@ -3,37 +3,50 @@
 # Homebrew plugin for KYMSU
 # https://github.com/welcoMattic/kymsu

-# Error: Cask 'onyx' definition is invalid: invalid 'depends_on macos' value: :snow_leopard
-#	Supprimer manuellement onyx de /Applications
-# 	rm -rvf "$(brew --prefix)/Caskroom/onyx"
-# ou
-# /usr/bin/find "$(brew --prefix)/Caskroom/"*'/.metadata' -type f -name '*.rb' -print0 | /usr/bin/xargs -0 /usr/bin/perl -i -0pe 's/depends_on macos: \[.*?\]//gsm;s/depends_on macos: .*//g'
-
 ###############################################################################################
 #
 # Settings:

-# Display info on updated pakages 
+# Display info on updated pakages / casks
 display_info=true

 # Casks don't have pinned cask. So add Cask to the do_not_update array for prevent to update.
-# Also add package for prevent to update whitout pin it.
 # declare -a do_not_update=("xnconvert" "yate")
-declare -a do_not_update=()
+declare -a cask_to_not_update=()

 # No distract mode (no user interaction)(Casks with 'latest' version number won't be updated)
-no_distract=false
+[[ $@ =~ "--nodistract" ]] && no_distract=true || no_distract=false

+# Some Casks have auto_updates true or version :latest. Homebrew Cask cannot track versions of those apps.
+# 'latest=true' force Homebrew to update those apps.
 latest=false
 #
 ###############################################################################################
 #
-# Recommended software (brew install):
+# Require software (brew install):
 #	-jq (Lightweight and flexible command-line JSON processor)
+#
+# Recommended software (brew install):
 #	-terminal-notifier (Send macOS User Notifications from the command-line)
 #
 ###############################################################################################

+: <<'END_COMMENT'
+blabla
+END_COMMENT
+
+italic="\033[3m"
+underline="\033[4m"
+ita_under="\033[3;4m"
+bgd="\033[1;4;31m"
+red="\033[1;31m"
+bold="\033[1m"
+box="\033[1;41m"
+reset="\033[0m"
+
+command -v terminal-notifier >/dev/null 2>&1 || { echo -e "You shoud intall ${bold}terminal-notifier${reset} for notification ${italic}(brew install terminal-notifier)${reset}.\n"; }
+command -v jq >/dev/null 2>&1 || { echo -e "${bold}kymsu2${reset} require ${bold}jq${reset} but it's not installed.\nRun ${italic}(brew install jq)${reset}\nAborting..." >&2; exit 1; }
+
 notification() {
    sound="Basso"
    title="Homebrew"
@@ -46,279 +59,184 @@ notification() {
 	fi
 }

+get_info_cask() {
+	info="$1"
+	app="$2"
+	l1=""
 	
-if [[ $1 == "--nodistract" ]]; then
-	no_distract=true
+	token=$(echo "$info" | jq -r '.[] | select(.token == "'${app}'") | (.token)')
+	name=$(echo "$info" | jq -r '.[] | select(.token == "'${app}'") | (.name)' | jq -r '.[0]')
+	homepage=$(echo "$info" | jq -r '.[] | select(.token == "'${app}'") | (.homepage)')
+	url=$(echo "$info" | jq -r '.[] | select(.token == "'${app}'") | (.url)')
+	desc=$(echo "$info" | jq -r '.[] | select(.token == "'${app}'") | (.desc)')
+	version=$(echo "$info" | jq -r '.[] | select(.token == "'${app}'") | (.version)')
+	#auto_updates=$(echo "$info" | jq -r '.[] | select(.token == "'${app}'") | (.auto_updates)')
+	#caveats=$(echo "$info" | jq -r '.[] | select(.token == "'${app}'") | (.caveats)')
+
+	installed_versions=$(echo "$upd_cask" | jq -r '.[] | select(.name == "'${app}'") | (.installed_versions)')
+	current_version=$(echo "$upd_cask" | jq -r '.[] | select(.name == "'${app}'") | (.current_version)')
+	
+	[[ "$desc" = "null" ]] && desc="${italic}No description${reset}"
+	
+	if [[ ! " ${casks_not_pinned} " =~ " ${token} " ]] && [[ ! " ${casks_latest_not_pinned} " =~ " ${token} " ]]; then
+		l1+="${red}$name ($token): installed: $installed_versions current: $current_version  [Do not update]${reset}\n"
+	else
+		l1+="${bold}$name ($token): installed: $installed_versions current: $current_version${reset}\n"	
 	fi
+	l1+="$desc\n"
+	l1+="$homepage"
 	
-if [[ $1 == "--latest" ]]; then
-	latest=true
+	echo -e "$l1\n"
+}
+
+get_info_pkg() {
+	info="$1"
+	pkg="$2"
+	l1=""
+	
+	name=$(echo "$info" | jq -r '.[] | select(.name == "'${pkg}'") | (.name)')
+	full_name=$(echo "$info" | jq -r '.[] | select(.name == "'${pkg}'") | (.full_name)')
+	desc=$(echo "$info" | jq -r '.[] | select(.name == "'${pkg}'") | (.desc)')
+	homepage=$(echo "$info" | jq -r '.[] | select(.name == "'${pkg}'") | (.homepage)')
+	
+	#urls=$(echo "$info" | jq -r '.[] | select(.name == "'${pkg}'") | (.urls)' | jq -r '.stable | .url')
+	keg_only=$(echo "$info" | jq -r '.[] | select(.name == "'${pkg}'") | (.keg_only)')
+	caveats=$(echo "$info" | jq -r '.[] | select(.name == "'${pkg}'") | (.caveats)')
+	stable=$(echo "$info" | jq -r '.[] | select(.name == "'${pkg}'") | (.versions)' | jq -r '.stable')
+	installed=$(echo "$info" | jq -r '.[] | select(.name == "'${pkg}'") | (.installed)' | jq -r '.[].version')
+	pinned=$(echo "$info" | jq -r '.[] | select(.name == "'${pkg}'") | (.pinned)')
+
+	if [ "$pinned" = "true" ]; then 	
+		pinned_v=$(echo "$upd_package" | jq -r '.[] | select(.name == "'${pkg}'") | (.pinned_version)')
+	
+		l1+="${red}$name: installed: $installed stable: $stable [pinned at $pinned_v]"
+		[ "$keg_only" = true ] && l1+=" [keg-only]"
+		l1+="${reset}\n"
+	else 
+		l1+="${bold}$name: installed: $installed stable: $stable"
+		[ "$keg_only" = true ] && l1+=" [keg-only]"
+		l1+="${reset}\n"
 	fi
+	if [ "$desc" != "null" ]; then l1+="$desc\n"; fi;
+	l1+="$homepage"
 	
-echo -e "\033[1m🍺  Homebrew \033[0m"
-echo ""
+	echo -e "$l1\n"
+}

+echo -e "${bold}🍺  Homebrew ${reset}"
+
+echo -e "\n🍺 ${underline}Updating brew...${reset}\n"
 brew update

 echo ""
-echo "Search for packages update..."
-echo ""
+brew_outdated=$(brew outdated --greedy --json=v2)
 	
-declare -A array_info 	# bash 5
-declare -A array_info_cask
+#echo "\nSearch for brew update...\n"
+upd_json=$(echo "$brew_outdated")

-if [ -x "$(command -v jq)" ]; then
+################
+### Packages ###
+################

-	### Recherche des mises-à-jour ###
+# Packages update:
+echo -e "\n🍺 ${underline}Search for packages update...${reset}\n"
+upd_package=$(echo "$brew_outdated" | jq '{formulae} | .[]')

-	brew_outdated2=$(brew outdated --greedy --json=v2)
-	upd_json=$(echo "$brew_outdated2")
-	
-	upd_package=$(echo "$upd_json" | jq '{formulae} | .[]')
-
-	upd_cask=$(echo "$upd_json" | jq '{casks} | .[]')
-
-	
-	### Liste des mises-à-jour (paquets et casks) ###
-		
-	for row in $(jq -c '{formulae} | .[] | .[]' <<< "$upd_json");
+for row in $(jq -c '.[]' <<< "$upd_package");
 do
 	name=$(echo "$row" | jq -j '.name')
+	installed_versions=$(echo "$row" | jq -j '.installed_versions' | jq -r '.[]')
+	current_version=$(echo "$row" | jq -j '.current_version')
 	pinned=$(echo "$row" | jq -j '.pinned')
+	#pinned_version=$(echo "$row" | jq -j '.pinned_version')
 		
-		upd_pkg+="$name "
+	upd_pkgs+="$name "
 	if [ "$pinned" = true ]; then
 		upd_pkg_pinned+="$name "
+	elif [ "$pinned" = false ]; then
+		upd_pkg_notpinned+="$name "
 	fi	
 done
-	upd_pkg=$(echo "$upd_pkg" | sed 's/.$//')
+upd_pkgs=$(echo "$upd_pkgs" | sed 's/.$//')
 upd_pkg_pinned=$(echo "$upd_pkg_pinned" | sed 's/.$//')
+upd_pkg_notpinned=$(echo "$upd_pkg_notpinned" | sed 's/.$//')

-	#pkg_pinned=$(brew list --pinned | xargs)
-	pkg_pinned=$(brew list --formulae --pinned | xargs)
-
-
-	### Recherche des infos sur les paquets ###
-
-	if [ -n "$upd_pkg" ]; then
-		# Only 1 request 'brew info' for all updated packages
-		info=$(brew info --json=v1 $upd_pkg)
-	
-		i=0
-		for row in $(echo "${info}" | jq -r '.[] | @base64');
+# Find infos about updated packages
+nb_pkg_upd=$(echo "$upd_pkgs" | wc -w | xargs)
+if [ "$nb_pkg_upd" -gt 0 ]; then
+	a="available package update"
+	array=($a)
+	if [ "$display_info" = true ]; then
+		[ "$nb_pkg_upd" -gt 1 ] && echo -e "${box} $nb_pkg_upd ${reset} ${array[@]/%/s}:\n" || echo -e "${box} $nb_pkg_upd ${reset} ${array[@]}:\n"
+		upd_pkgs_info=$(brew info --json=v2 $upd_pkgs | jq '{formulae} | .[]')
+		for row in $upd_pkgs;
 		do
-		    _jq() {
-		     echo ${row} | base64 --decode | jq -r ${1}
-	    	}
-
-			name=$(_jq '.name')
-			homepage=$(_jq '.homepage')
-			# encoding to base64 to prevent errors with some characters (')
-			desc=$(_jq '.desc' | base64 --break=0)	# BSD: break=0 GNU: wrap=0
-			pinned=$(_jq '.pinned')
-			installed_v=$(_jq '.installed[].version')
-			stable=$(_jq '.versions.stable')
-			
-			eval "declare -a array_info$i=($name $homepage $desc $pinned $installed_v $stable)"
-			((i++))
+			get_info_pkg "$upd_pkgs_info" "$row"
 		done
-		nb_upd_pkg=$i
-		i=0
-	fi
-
 	else
-	brew_outdated=$(brew outdated)	
-	upd_pkg=$(echo "$brew_outdated" | awk '{print $1}')
-	
-	if [ -n "$upd_pkg" ]; then
-		info=$(brew info $upd_pkg)
-		for i in $upd_pkg
-		do
-			a=$(grep -A 3 "$i: stable" <<< "$info")
-			array_info["$i"]="$a"
-		done
-		nb_upd_pkg=${#array_info[@]}
+		[ "$nb_pkg_upd" -gt 1 ] && echo -e "${box} $nb_pkg_upd ${reset} ${array[@]/%/s}: ${bold}$upd_pkgs${reset}" || echo -e "${box} $nb_pkg_upd ${reset} ${array[@]}: ${bold}$upd_pkgs${reset}"
 	fi
 fi

-
-### Display pinned packages ##
-
+# Pinned packages
+pkg_pinned=$(brew list --pinned | xargs)
 if [ -n "$pkg_pinned" ]; then

 	nbp=$(echo "$pkg_pinned" | wc -w | xargs)

-	echo -e "\033[4mList of\033[0m \033[1;41m $nbp \033[0m \033[4mpinned packages:\033[0m"
-	echo -e "\033[1;31m$pkg_pinned\033[0m"
+	echo -e "\n${underline}List of${reset} ${box} $nbp ${reset} ${underline}pinned packages:${reset}"
+	echo -e "${red}$pkg_pinned${reset}"
 	echo "To update a pinned package, you need to un-pin it manually (brew unpin <formula>)"
 	echo ""

 fi

-
-### Display infos for all updated packages ##
-
-if [ -n "$upd_pkg" ]; then
-		
-	# Display info on outdated packages
-	
-	if [ "$display_info" = true ]; then
-		echo -e "\033[4mInfo on\033[0m \033[1;41m $nb_upd_pkg \033[0m \033[4mupdated packages:\033[0m"
-		
-		if [ -x "$(command -v jq)" ]; then
-		# ok avec jq installé
-		
-			i=0
-			for row in $(jq -c '.[]' <<< "$upd_package");
-			do
-				name=$(echo "$row" | jq -j '.name, "\n"'); 
-				pinned=$(echo "$row" | jq -j '.pinned, "\n"');
-				pinned_v=$(echo "$row" | jq -j '.pinned_version, "\n"');
-				iv=$(echo "$row" | jq -j '.installed_versions, "\n"');
-				installed_v=$(echo "$iv" | jq -j '.[]');
-				current_v=$(echo "$row" | jq -j '.current_version, "\n"');
-
-				#n="array_info$i[0]"
-				#name=$(echo ${!n})
-				h="array_info$i[1]"
-				homepage=$(echo ${!h})
-				
-				d="array_info$i[2]"
-				desc=$(echo ${!d} | base64 --decode)
-				
-				#echo "$name - $homepage - $desc"
-				
-				#info_pkg=$(brew info --json=v1 "$name")
-				#homepage=$(echo "$info_pkg" | jq -r .[].homepage)
-				#desc=$(echo "$info_pkg" | jq -r .[].desc)
-				#current=$(echo "$info_pkg" | jq -r .[].installed[].version | tail -n 1 | awk '{print $1}')
-				#stable=$(echo "$info_pkg" | jq -r .[].versions.stable)
-				#pined=$(echo "$info_pkg" | jq -r .[].pinned)
-				
-				if [ "$pinned" = "true" ]; then 
-					l1+="\033[1;31m$name: installed: $installed_v stable: $current_v [pinned at $pinned_v]\033[0m\n";
-				else 
-					l1+="\033[1;37m$name: installed: $installed_v stable: $current_v\033[0m\n";
-				fi
-				if [ "$desc" != "null" ]; then l1+="$desc\n"; fi;
-				l1+="\033[4m$homepage\033[0m\n"
-				l1+="\n"
-
-				((i++))
-			done
-			
-			echo -e "$l1"
-		else
-		# ok sans jq
-		
-			for pkg in $upd_pkg
-			do
-				info_pkg="${array_info[$pkg]}"
-				ligne1=$(echo "$info_pkg" | head -n 1)
-				desc=$(echo "$info_pkg"| sed '1d')
-				
-				if [[ $ligne1 =~ "pinned" ]]; then # same as if [[ $ligne1 == *"pinned"* ]]; then
-					echo -e "\033[1;31m$ligne1\033[0m"
-				else
-					echo -e "\033[1m$ligne1\033[0m"		
-				fi
-				
-				echo "$desc"
-				echo ""
-			done
-		fi
-
-	fi
-
-
 ### Usefull for notify recent modification of apache/mysql/php conf files. ###
 touch /tmp/checkpoint

+# Updating packages
+echo -e "\n🍺 ${underline}Updating packages...${reset}\n"
+[ -n "$upd_pkg_notpinned" ] && echo -e "${red}Pinned: $upd_pkg_pinned . It won't be updated!'${reset}\n"

-	### Remove pinned packages from outdated packages list ###
-
-	not_pinned=""
-	for i in $upd_pkg
-	do
-		if [[ ! " ${upd_pkg_pinned[@]} " =~ " ${i} " ]]; then
-   			# whatever you want to do when array doesn't contain value
-   			not_pinned+="$i "
-		fi
-
-	done
-	not_pinned=$(echo "$not_pinned" | sed 's/.$//')
-
-
-	### Update outdated packages ###
+if [ -n "$upd_pkg_notpinned" ]; then

 	if [ "$no_distract" = false ]; then
-	
-		if [ -n "$not_pinned" ]; then
-		
-			a=$(echo -e "Do you wanna run \033[1mbrew upgrade "$not_pinned"\033[0m ? (y/n/a)")
+		a=$(echo -e "Do you wanna run ${bold}brew upgrade "$upd_pkg_notpinned"${reset} ? (y/n/a) ")
 		# yes/no/all
 		read -p "$a" choice

 		if [ "$choice" == "y" ] || [ "$choice" == "Y" ] || [ "$choice" == "a" ] || [ "$choice" == "A" ]; then
-		
-				for i in $not_pinned
+			for i in $upd_pkg_notpinned;
 			do
-					FOUND=`echo ${do_not_update[*]} | grep "$i"`
-					if [ "${FOUND}" = "" ]; then
 				if [ "$choice" == "y" ] || [ "$choice" == "Y" ]; then
-							echo "$i" | awk '{print $1}' | xargs -p -n 1 brew upgrade --formula 
-							echo ""
+					echo "$i" | xargs -p -n 1 brew upgrade 
 				elif [ "$choice" == "a" ] || [ "$choice" == "A" ]; then
-							echo "$i" | awk '{print $1}' | xargs -n 1 brew upgrade --formula 
-							echo ""
-						fi
+					echo "$i" | xargs -n 1 brew upgrade
 				fi
 			done
 		else
-				echo "Ok, let's continue"		
+			echo -e "OK, let's continue..."
 		fi
+	else
+		#echo "No distract"
+		echo -e "Running ${bold}brew upgrade $upd_pkg_notpinned${reset}..."
+		echo "$upd_pkg_notpinned" | xargs -n 1 brew upgrade
 	fi
 	
-	else	# no distract = true
-	
-		if [ -n "$not_pinned" ]; then
-			echo "$not_pinned" | awk '{print $1}' | xargs -n 1 brew upgrade --formula 
-			echo ""
-		fi
-		
-	fi
-	
-	
-	echo ""
-
 else
-	echo -e "\033[4mNo package to update.\033[0m"
+	echo -e "\n${italic}No update package available...${reset}\n"
 fi

 echo ""

-#################
-##### CASKS #####
-#################
+#############
+### Casks ###
+#############

-echo -e "\033[1m🍺  Casks upgrade \033[0m"
-echo ""
+#Casks update	
+echo -e "\n🍺 ${underline}Casks...${reset}\n"
+upd_cask=$(echo "$brew_outdated" | jq '{casks} | .[]')

-if (( ${#do_not_update[@]} )); then
-
-	nbp=${#do_not_update[*]}
-	
-	echo -e "\033[4mList of\033[0m \033[1;41m $nbp \033[0m \033[4m'do not update' packages:\033[0m"
-	echo -e "\033[1;31m${do_not_update[*]}\033[0m"
-	echo "To remove package from this list, you need to edit the do_not_update array."
-	echo ""
-
-fi
-
-echo "Search for Casks update..."
-echo ""
-
-i=0
 for row in $(jq -c '.[]' <<< "$upd_cask");
 do
 	name=$(echo "$row" | jq -j '.name')
@@ -327,199 +245,166 @@ do
 	
 	if [ "$current_version" != "latest" ]; then
 		upd_casks+="$name "
-		
-		eval "declare -a array_info_cask$i=($name $installed_versions $current_version)"
-		((i++))
-		
 	elif [ "$current_version" == "latest" ]; then
 		upd_casks_latest+="$name "
 	fi
-
 done
-
 upd_casks=$(echo "$upd_casks" | sed 's/.$//')
 upd_casks_latest=$(echo "$upd_casks_latest" | sed 's/.$//')

-nb_upd_casks=$(echo "$upd_casks" | wc -w | xargs)
-nb_upd_casks_latest=$(echo "$upd_casks_latest" | wc -w | xargs)
+# Do not update casks
+if (( ${#cask_to_not_update[@]} )); then

+	# cask_to_not_update contient 1 cask ET/OU 1 latest

-if [ -z "$upd_casks" ] && [ -z "$upd_casks_latest" ]; then
-
-	echo -e "\033[4mNo availables Cask updates.\033[0m"
-	
-else
-
-	if [ -n "$upd_casks" ]; then
-
-		echo -e "\033[1;41m $nb_upd_casks \033[0m \033[4mAvailables Casks updates:\033[0m"
-		
-		# Display info on outdated packages
-	
-		if [ "$display_info" = true ]; then
-
-			#info_cask=$(brew cask info $upd_casks)
-			info_cask=$(brew info --cask $upd_casks)
-
-			for i in $upd_casks
-			do
-				b=$(grep -A 1 "$i:" <<< "$info_cask")
-				bb=$(echo "$b" | tail -n 1)
-				array_info_cask["$i"]="$bb"
-			done
-
-			l1=""
-			for row in $(jq -c '.[]' <<< "$upd_cask");
-			do		
-				installed_versions=$(echo "$row" | jq -j '.installed_versions')
-				if [ "$installed_versions" != "latest" ]; then
-					name=$(echo "$row" | jq -j '.name')
-					current_version=$(echo "$row" | jq -j '.current_version')
-					url=${array_info_cask[$name]}
-					
-					if [[ ! " ${do_not_update[@]} " =~ " ${name} " ]]; then
-						l1+="\033[1;37m$name: installed: $installed_versions current: $current_version\033[0m\n"
-					else
-						l1+="\033[1;31m$name: installed: $installed_versions current: $current_version [Do not update]\033[0m\n"
-					fi					
-					l1+="$url\n\n"
-				fi
-			done
-			
-			echo -e "$l1"
-			#echo -e "$l1" | sed ':a;N;$!ba;s/\n//g'	# supprimer les sauts de ligne
-			#echo -e "$l1" | tr -d '\n'				# supprimer les sauts de ligne
-		fi
+	nbp=${#cask_to_not_update[*]}
 	
+	echo -e "${underline}List of${reset} ${box} $nbp ${reset} ${underline}'do not update' casks:${reset}"
+	echo -e "${red}${cask_to_not_update[*]}${reset}"
+	echo -e "To remove an app from this list, you need to edit the ${italic}do_not_update${reset} array."
 	echo ""

-		#brew cask info betterzip
+	casks_not_pinned=""
+	for i in $upd_casks
+	do
+		if [[ ! " ${cask_to_not_update[@]} " =~ " ${i} " ]]; then
+   			casks_not_pinned+="$i "
+		fi
+	done
+	casks_not_pinned=$(echo "$casks_not_pinned" | sed 's/.$//')
+
+	casks_latest_not_pinned=""
+	for i in $upd_casks_latest
+	do
+		if [[ ! " ${cask_to_not_update[@]} " =~ " ${i} " ]]; then
+   			casks_latest_not_pinned+="$i "
+		fi
+	done
+	casks_latest_not_pinned=$(echo "$casks_latest_not_pinned" | sed 's/.$//')
+
+else
+	casks_not_pinned=$upd_casks
+	casks_latest_not_pinned=$upd_casks_latest
+fi
+
+#Casks update	
+echo -e "🍺 ${underline}Search for casks update...${reset}\n"
+
+# Find infos about updated casks
+nb_casks_upd=$(echo "$upd_casks" | wc -w | xargs)
+if [ "$nb_casks_upd" -gt 0 ]; then
+	a="available cask update"
+	array=($a)
+	if [ "$display_info" = true ]; then
+		[ "$nb_casks_upd" -gt 1 ] && echo -e "${box} $nb_casks_upd ${reset} ${array[@]/%/s}:\n" || echo -e "${box} $nb_casks_upd ${reset} ${array[@]}:\n"
+		upd_casks_info=$(brew info --cask --json=v2 $upd_casks | jq '{casks} | .[]')
+		for row in $upd_casks;
+		do
+			get_info_cask "$upd_casks_info" "$row"
+		done
+	else
+		[ "$nb_casks_upd" -gt 1 ] && echo -e "${box} $nb_casks_upd ${reset} ${array[@]/%/s}: ${bold}$upd_casks${reset}" || echo -e "${box} $nb_casks_upd ${reset} ${array[@]}: ${bold}$upd_casks${reset}"
+	fi
+fi
+
+# Updating casks
+echo -e "\n🍺 ${underline}Updating casks...${reset}\n"
+
+[ "${#cask_to_not_update[@]}" -gt 0 ] && echo -e "${red}Do not update: ${cask_to_not_update[@]} . It won't be updated!'${reset}\n"
+[ -n "$casks_latest_not_pinned" ] && echo -e "Some Casks have ${italic}auto_updates true${reset} or ${italic}version :latest${reset}. Homebrew Cask cannot track versions of those apps."
+[ -n "$casks_latest_not_pinned" ] && echo -e "Edit this script and change the setting ${italic}latest=false${reset} to ${italic}true${reset}\n"
+
+
+if [ -n "$casks_not_pinned" ]; then

-		##########
 	if [ "$no_distract" = false ]; then
-		
-			a=$(echo -e "Do you wanna run \033[1;37mbrew upgrade $upd_casks\033[0m ? (y/n/a)")
+		a=$(echo -e "Do you wanna run ${bold}brew upgrade $casks_not_pinned${reset} ? (y/n/a) ")
 		# yes/no/all
 		read -p "$a" choice

 		if [ "$choice" == "y" ] || [ "$choice" == "Y" ] || [ "$choice" == "a" ] || [ "$choice" == "A" ]; then		
-		
-				# boucle for: don't stop multiples updates if one block (bad checksum, not compatible with OS version (Onyx))
-
-				for i in $upd_casks
+			echo ""
+			for i in $casks_not_pinned;
 			do
-					FOUND=`echo ${do_not_update[*]} | grep "$i"`
-		
-					if [ "${FOUND}" == "" ]; then
-				#echo "$i" | xargs brew cask reinstall
-				#echo "$i" | xargs -p -n 1 brew reinstall
-				#echo "$i" | xargs -p -n 1 brew upgrade --cask
-
-						#b=$(echo -e "Do you wanna run \033[1;37mbrew upgrade homebrew/cask/$i\033[0m ? (y/n)")
-  						#read -p "$b" choice				
-
 				if [ "$choice" == "y" ] || [ "$choice" == "Y" ]; then
-							#echo "$i" | awk '{print $1}' | xargs -p -n 1 brew upgrade homebrew/cask/$i
-							echo "$i" | awk '{print $1}' | xargs -p -n 1 brew upgrade --cask 
-
-							retCode=$?
-							echo "code retour: $retCode"
+					# --cask required for Cask like 'docker'. It can be a formula or a cask.
+					echo "$i" | xargs -p -n 1 brew upgrade --cask
 					echo ""
 				elif [ "$choice" == "a" ] || [ "$choice" == "A" ]; then
-							#brew upgrade homebrew/cask/$i
-							brew upgrade  --cask $i
-							retCode=$?
-							echo "code retour: $retCode"
+					echo "$i" | xargs -n 1 brew upgrade --cask
 					echo ""
 				fi
-				
-					fi
 			done
 		else
-				echo "Ok, let's continue"		
+			echo -e "OK, let's continue..."
 		fi
-		else	# no distract = true
-			echo "no distract"
-		
-		fi
-		#########
+	else
+		echo "$casks_not_pinned" | xargs -n 1 brew upgrade --cask
 	fi

-	echo ""
+else
+	echo -e "\n${italic}No update cask available...${reset}\n"
+fi

-	if [ -n "$upd_casks_latest" ] && [ "$latest" == true ]; then

-		echo -e "\033[1;41m $nb_upd_casks_latest \033[0m \033[4mCasks (latest) updates:\033[0m"
-
-		# Display info on outdated packages
+# Updating casks latest
+if [ -n "$casks_latest_not_pinned" ] && [ "$latest" == true ]; then
+	echo -e "\n🍺 ${underline}Updating casks with 'latest' as version...${reset}\n"
+	#echo -e "Some Casks have ${italic}auto_updates true${reset} or ${italic}version :latest${reset}. Homebrew Cask cannot track versions of those apps."
+	#echo -e "Here you can force Homebrew to upgrade those apps.\n"

+	# Find infos about updated casks
+	nb_casks_latest_upd=$(echo "$upd_casks_latest" | wc -w | xargs)
+	if [ "$nb_casks_latest_upd" -gt 0 ]; then
+		a="available cask update"
+		array=($a)
 		if [ "$display_info" = true ]; then
+			[ "$nb_casks_latest_upd" -gt 1 ] && echo -e "${box} $nb_casks_latest_upd ${reset} ${array[@]/%/s}:\n" || echo -e "${box} $nb_casks_latest_upd ${reset} ${array[@]}:\n"

-			#info_cask_latest=$(brew cask info $upd_casks_latest)
-			info_cask_latest=$(brew info --cask $upd_casks_latest)
-			
-			for i in $upd_casks_latest
+			upd_casks_latest_info=$(brew info --cask --json=v2 $upd_casks_latest | jq '{casks} | .[]')
+			for row in $upd_casks_latest;
 			do
-				c=$(grep -A 1 "$i:" <<< "$info_cask_latest")
-				cc=$(echo "$c" | tail -n 1)
-				array_info_cask["$i"]="$cc"
+				get_info_cask "$upd_casks_latest_info" "$row"
 			done
 		
-			l2=""
-			for row in $(jq -c '.[]' <<< "$upd_cask");
-			do		
-				installed_versions=$(echo "$row" | jq -j '.installed_versions')
-				if [ "$installed_versions" = "latest" ]; then
-					name=$(echo "$row" | jq -j '.name')
-					current_version=$(echo "$row" | jq -j '.current_version')
-					url=${array_info_cask[$name]}
-
-					if [[ ! " ${do_not_update[@]} " =~ " ${name} " ]]; then
-						l2+="\033[1;37m$name: installed: $installed_versions current: $current_version\033[0m\n"
 		else
-						l2+="\033[1;31m$name: installed: $installed_versions current: $current_version [Do not update]\033[0m\n"	    
+			[ "$nb_casks_latest_upd" -gt 1 ] && echo -e "${box} $nb_casks_latest_upd ${reset} ${array[@]/%/s}: ${bold}$upd_casks_latest${reset}" || echo -e "${box} $nb_casks_upd ${reset} ${array[@]}: ${bold}$upd_casks_latest${reset}"
 		fi
-					l2+="$url\n\n"
-				fi
-			done
-			
-			echo -e "$l2" | sed ':a;N;$!ba;s/\n//g'
 	
 	fi
 	
-		echo ""
-	
-		q=$(echo -e "Do you wanna run \033[1;37mbrew upgrade --cask --greedy <cask>\033[0m ? (y/n/a)")
+	if [ "$no_distract" = false ]; then
+		q=$(echo -e "Do you wanna run ${bold}brew upgrade $casks_latest_not_pinned${reset} ? (y/n/a) ")
 		read -p "$q" choice

 		if [ "$choice" == "y" ] || [ "$choice" == "Y" ] || [ "$choice" == "a" ] || [ "$choice" == "A" ]; then
-			for i in $upd_casks_latest
+			echo ""
+			for i in $casks_latest_not_pinned
 			do
-				FOUND=`echo ${do_not_update[*]} | grep "$i"`
-		
-				if [ "${FOUND}" == "" ]; then
-				
 				if [ "$choice" == "y" ] || [ "$choice" == "Y" ]; then
-						echo "$i" | xargs -p -n 1 brew upgrade --cask --greedy
+					echo "$i" | xargs -p -n 1 brew upgrade --cask
 					echo ""
 				elif [ "$choice" == "a" ] || [ "$choice" == "A" ]; then
-						echo "$i" | xargs -n 1 brew upgrade --cask --greedy
+					echo "$i" | xargs -n 1 brew upgrade --cask
 					echo ""
 				fi
-				fi
 			done
+
 		else
-			echo "Ok, let's continue..."		
+			echo -e "OK, let's continue..."
 		fi

+	else
+		echo -e "Running ${bold}brew upgrade $casks_latest_not_pinned${reset}..."
+		echo "$casks_latest_not_pinned" | xargs -n 1 brew upgrade
+	fi
 fi

-fi

-echo ""
-
-
-### Test if Apache conf file has been modified by Homebrew (Apache, PHP or Python updates) ###
+###############################################################
+### Test if Apache conf file has been modified by Homebrew  ###
+###                   (Apache, PHP or Python updates)       ###
+###############################################################

 v_apa=$(httpd -V | grep 'SERVER_CONFIG_FILE')
 conf_apa=$(echo "$v_apa" | awk -F "\"" '{print $2}')
@@ -542,7 +427,6 @@ do
 	if [ -n "$upd_pkg" ]; then

 		# file modified since it was last read	
-	
 		php_modified=$(find /usr/local/etc/php/$php/ -name php.ini -newer /tmp/checkpoint)
 		php_ini=/usr/local/etc/php/$php/php.ini
 		notif2="$php_ini has been modified"
@@ -553,7 +437,6 @@ do
 		[ ! -z $php_modified ] && notification "$notif2"
 		
 	fi
-	
 done
 echo ""

@@ -562,8 +445,7 @@ echo ""
 ### Doctor ###
 ##############

-echo "🍺  ️The Doc is checking that everything is ok."
-echo ""
+echo -e "\n🍺 ${underline}The Doc is checking that everything is ok...${reset}\n"

 brew doctor

@@ -575,7 +457,7 @@ echo ""
 # Homebrew 2.0.0+ run a cleanup every 30 days

 if [[ $1 == "--cleanup" ]]; then
-  echo "🍺  Cleaning brewery"
+  echo -e "🍺  Cleaning brewery..."
  
  #HOMEBREW_NO_INSTALL_CLEANUP
  
--- a/plugins.d/mas.sh
+++ b/plugins.d/mas.sh
@@ -3,16 +3,25 @@
 # Mac Appstore plugin for KYMSU
 # https://github.com/welcoMattic/kymsu

-echo -e "\033[1m🍏  Mac App Store updates come fast as lightning \033[0m"
-
 # No distract mode (no user interaction)
-no_distract=false
+[[ $@ =~ "--nodistract" ]] && no_distract=true || no_distract=false

-if [[ $1 == "--nodistract" ]]; then
-	no_distract=true
-fi
+italic="\033[3m"
+underline="\033[4m"
+ita_under="\033[3;4m"
+bold="\033[1m"
+bold_under="\033[1;4m"
+redbox="\033[1;41m"
+redbold="\033[1;31m"
+red="\033[31m"
+yellow="\033[33m"
+reset="\033[0m"
+
+
+echo -e "${bold}🍏  Mac App Store updates come fast as lightning ${reset}"
+
+echo -e "https://github.com/mas-cli/mas"

-# https://github.com/mas-cli/mas
 # On teste si mas est installé
 if hash mas 2>/dev/null; then

@@ -21,13 +30,13 @@ if hash mas 2>/dev/null; then
 	echo "$massy"

 	if [ -n "$(mas outdated)" ]; then
-		echo -e "\033[4mAvailables updates:\033[0m"
+		echo -e "${underline}Availables updates:${reset}"
 		echo "$massy" | cut -d " " -f2-5
 		echo ""
 	
 		if [ "$no_distract" = false ]; then
 	
-			a=$(echo -e "Do you wanna run \033[1mmas upgrade\033[0m ? (y/n)")
+			a=$(echo -e "Do you wanna run \033[1mmas upgrade${reset} ? (y/n)")
 			read -pr "$a" choice
 			case "$choice" in
 				y|Y|o ) mas upgrade;;
@@ -40,10 +49,10 @@ if hash mas 2>/dev/null; then
 		fi
 	
 	else
-		echo -e "\033[4mNo availables mas updates.\033[0m"
+		echo -e "${italic}No availables mas updates.${reset}"
 	fi
 else
-	echo "Please install mas: brew install mas"
+	echo -e "Please install mas: ${italic}brew install mas${reset}"
 fi

 echo ""
--- a/plugins.d/node.sh
+++ b/plugins.d/node.sh
@@ -3,29 +3,16 @@
 # npm plugin for KYMSU (install local package)
 # https://github.com/welcoMattic/kymsu

-# Fixing npm On Mac OS X for Homebrew Users
-# https://gist.github.com/rcugut/c7abd2a425bb65da3c61d8341cd4b02d
-# https://gist.github.com/DanHerbert/9520689
-
-# brew install node
-# node -v => 9.11.1
-# npm -v => 5.6.0
-
-# npm install -g npm
-# npm -v => 5.8.0
-
-# https://github.com/npm/npm/issues/17744
-
 #########################################
 #
 # Settings:

-# No distract mode (no user interaction)
-no_distract=false
+# Display info on updated pakages / casks
+display_info=true

-if [[ $1 == "--nodistract" ]]; then
-	no_distract=true
-fi
+# No distract mode (no user interaction)
+
+[[ $@ =~ "--nodistract" ]] && no_distract=true || no_distract=false

 # Set ls_color to '' for output nvm list in default colors, else '--no-colors'
 # ls_color='--no-colors'
@@ -40,31 +27,60 @@ local_path=$HOME/Sites/node_modules/

 #########################################

-echo -e "\033[1m🌿  npm \033[0m"
+: <<'END_COMMENT'
+blabla
+END_COMMENT
+
+italic="\033[3m"
+underline="\033[4m"
+ita_under="\033[3;4m"
+bgd="\033[1;4;31m"
+red="\033[1;31m"
+bold="\033[1m"
+bold_ita="\033[1;3m"
+box="\033[1;41m"
+reset="\033[0m"
+
+upd_nvm() {(
+  cd "$NVM_DIR"
+  git fetch --tags origin
+  git checkout `git describe --abbrev=0 --tags --match "v[0-9]*" $(git rev-list --tags --max-count=1)`
+) && \. "$NVM_DIR/nvm.sh"
+}
+
+
+echo -e "${bold}🌿  npm ${reset}"
 echo ""

 # version courante de node.js
 node_v=$(node -v)
-echo -e "\033[4m🌿  node.js\033[0m (current version): $node_v"
+node_ins=$(which node)
+echo -e "${underline}🌿  node.js:${reset}"
+echo -e "     - current version: ${italic}$node_v${reset}"
+echo -e "     - install path: ${italic}$node_ins${reset}"

 # version courante de npm
 npm_v=$(npm -v)
-echo -e "\033[4m🌿  npm\033[0m (current version): $npm_v"
+npm_ins=$(which npm)
+echo -e "\n${underline}🌿  npm:${reset}"
+echo -e "     - current version: ${italic}$npm_v${reset}"
+echo -e "     - install path: ${italic}$npm_ins${reset}"

 # version installée de nvm par Homebrew
-nvm_installed=$(brew info nvm | grep Cellar)
+# nvm_installed=$(brew info nvm | grep Cellar)
+
 # version actuelle de nvm sur GitHub
 version_nvm=$(git ls-remote --tags --refs --sort="v:refname" git://github.com/nvm-sh/nvm.git | tail -n1 | sed 's/.*\///' | sed 's/v//')

-# github
+# nvm from github
 if [ -f "$NVM_DIR/nvm.sh" ]; then
 	source $NVM_DIR/nvm.sh
+
 	# version courante de nvm
 	nvm_v=$(nvm --version)
-	#echo "$nvm_v,$version_nvm" | tr ',' '\n' | sort -V
 		
-	echo -e "\033[4m🌿  nvm install is:\033[0m $NVM_DIR/nvm.sh"
-	echo "nvm $nvm_v is installed from https://github.com/nvm-sh/nvm"
+	echo -e "\n${underline}🌿  nvm install is:${reset} $NVM_DIR/nvm.sh"
+	echo "     - nvm $nvm_v is installed from https://github.com/nvm-sh/nvm"

 	if [ "$nvm_v" != "$version_nvm" ]; then
 		echo "Current nvm version on GitHub: $version_nvm"
@@ -76,6 +92,7 @@ if [ -f "$NVM_DIR/nvm.sh" ]; then
 			echo "Updating nvm from GitHub..."
 			#curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v"$version_nvm"/install.sh | bash
 			
+			upd_nvm
 			#curl: native on Catalina, wget installed by homebrew
 			#wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.2/install.sh | bash
 			#curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.2/install.sh | bash
@@ -83,14 +100,16 @@ if [ -f "$NVM_DIR/nvm.sh" ]; then
 	fi
 	
 	node_install=$(nvm list "$ls_color")
-	echo -e "\033[4m🌿  node.js\033[0m (installed versions): \n$node_install"
+	echo -e "\n${underline}🌿  node.js${reset} (installed versions): \n$node_install"

-# homebrew
+# nvm from homebrew
 elif [ -f "/usr/local/opt/nvm/nvm.sh" ]; then
 	source $(brew --prefix nvm)/nvm.sh
+
 	# version courante de nvm
 	nvm_v=$(nvm --version)
-	echo -e "\033[4m🌿  nvm install is:\033[0m /usr/local/opt/nvm/nvm.sh"
+		
+	echo -e "\n${underline}🌿  nvm install is:${reset} /usr/local/opt/nvm/nvm.sh"
 	echo "nvm $nvm_v is installed from homebrew"

 	if [ "$nvm_v" != "$version_nvm" ]; then
@@ -98,96 +117,135 @@ elif [ -f "/usr/local/opt/nvm/nvm.sh" ]; then
 		echo "Current nvm installed version: $nvm_v"
 		
 		echo -e "nvm is outdated ! You should run \033[1;3mbrew update && brew upgrade nvm\033[0m"
-		echo -e "or run \033[1;3mKymsu's homebrew.sh script\033[0m."
+		echo -e "or run \033[1;3mKymsu's homebrew.sh script.${reset}"
 	fi
 		
 	node_install=$(nvm list "$ls_color")
-	echo -e "\033[4m🌿  node.js\033[0m (installed versions): \n$node_install"
+	echo -e "\n${underline}🌿  node.js${reset} (installed versions): \n$node_install"

 fi

-echo -e "\033[3mNote:"
+echo -e "${italic}Note:"
 echo -e "N/A: version \"10.18.0 -> N/A\" is not yet installed."
-echo -e "You need to run \"nvm install 10.18.0\" to install it before using it.\033[0m"
+echo -e "You need to run \"nvm install 10.18.0\" to install it before using it.${reset}"

-echo
+echo ""
+
+##################
+# Local packages #
+##################

-# Local packages
 if [ -d "$local_path" ]; then
 	cd "$local_path" || return
-	echo -e "\033[4m🌿  Local installed scripts:\033[0m"
+	echo -e "${underline}🌿  Local installed scripts:${reset}"
+	
+	if [ "$display_info" = true ]; then
+		ll=$(npm ls --long  | grep -v 'git$')
+
+		while IFS= read -r line
+		do 
+			if [[ "${line}" =~ "──" ]] || [[ "${line}" =~ "─┬" ]]; then 
+				echo -e "${bold}${line}${reset}"
+			else
+				echo -e "${line}"
+			fi
+		done <<< "$ll"
+	else
 		npm ls
+	fi
+	
+
+	echo -e "\n${underline}🌿 Search for local packages update...${reset}\n"	
 	outdated=$(npm outdated)
 	if [ -n "$outdated" ]; then
-		echo "$outdated"
-		echo "$outdated" | awk '{print $1}' | xargs npm update
-	else
-		echo -e "\033[4mNo local packages updates.\033[0m"
-	fi
-fi
 	
-echo ""
+		echo -e "\n${underline}🌿 Updating local packages...${reset}\n"

-# Global packages
-echo -e "\033[4m🌿  Global installed scripts:\033[0m"
-npm list -g --depth=0
-
-#g_outdated=$(npm outdated -g)
-g_outdated=$(npm outdated -g --parseable=true)
-
-# => npm ERR! Cannot read property 'length' of undefined -> https://stackoverflow.com/questions/55172700/npm-outdated-g-error-cannot-read-property-length-of-undefined
-# /Users/bruno/.nvm/versions/node/v10.16.2/lib/node_modules/npm/lib/outdated.js
-# /usr/local/lib/node_modules/npm/lib/outdated.js
-
-# update -> wanted ; install -> latest
-if [ -n "$g_outdated" ]; then
 		if [ "$no_distract" = false ]; then
-		#echo "$g_outdated" | sed '1d' | awk '{print $1}' | xargs -p -n 1  npm install -g 
-		#echo "$g_outdated" | sed '1d' | awk '{print $1}' | xargs -p -n 1 npm update -g --verbose
-		# npm verb outdated not updating @angular/cli because it's currently at the maximum version that matches its specified semver range
-
-		echo "$g_outdated" | cut -d : -f 4 | xargs -p -n 1 npm -g install
-		
+			#echo "$outdated"
+			echo "$outdated" | awk '{print $1}' | xargs -p -n 1 npm update
 		else
-		#echo "$g_outdated" | sed '1d' | awk '{print $1}' | xargs -n 1  npm install -g
-		#echo "$g_outdated" | sed '1d' | awk '{print $1}' | xargs -n 1 npm update -g
-		
-		echo "$g_outdated" | cut -d : -f 4 | xargs -n 1 npm -g install
+			#echo "$outdated"
+			echo "$outdated" | awk '{print $1}' | xargs -n 1 npm update
 		fi
+		
 	else
-	echo -e "\033[4mNo global packages updates.\033[0m"
+		echo -e "${italic}No local packages updates.${reset}"
+	fi
 fi
 	
 echo ""

-# Maintenance
+###################
+# Global packages #
+###################
+
+echo -e "${underline}🌿  Global installed scripts:${reset}"
+
+if [ "$display_info" = true ]; then
+	lg=$(npm list -g --depth=0 --long | grep -v 'git$')
+
+	while IFS= read -r line
+	do 
+		if [[ "${line}" =~ "──" ]]; then 
+			echo -e "${bold}${line}${reset}"
+		else
+			echo -e "${line}"
+		fi
+	done <<< "$lg"
+else
+	npm list -g --depth=0
+fi
+
+
+#Packages update	
+echo -e "\n${underline}🌿 Search for global packages update...${reset}\n"
+
+glong_outdated=$(npm outdated -g --long | sed '1d')
+
+if [ -n "$glong_outdated" ]; then
+	echo -e "$glong_outdated\n"
+	echo -e "\n${underline}🌿 Updating global packages...${reset}\n"
+	
+	while IFS= read -r line
+	do 
+		pkg=$(echo "$line" | awk '{print $1}')
+		vers=$(echo "$line" | awk '{print $4}')
+		outdated="$pkg@$vers"
+
+		# TEST
+		version=$(echo "$line" | awk '{print $1 "@" $4}')
+		echo "$version"
+		# /test
+		
+		if [ "$no_distract" = false ]; then
+			echo "$outdated" | xargs -p -n 1 npm -g install
+			echo ""
+		else
+			echo "$outdated" | xargs -n 1 npm -g install
+			echo ""
+		fi
+
+	done <<< "$glong_outdated"
+
+else
+	echo -e "${italic}No global packages updates.${reset}"
+fi
+
+echo ""
+
+###############
+# Maintenance #
+###############
+
 if [ "$doctor" = true ]; then
-	echo "🌿  The Doc is checking that everything is ok."
+	echo -e "${underline}🌿  The Doc is checking that everything is ok.${reset}\n"
 	npm doctor
 	echo ""
 	
-    echo "🔍   Verifying npm cache"
+    echo -e "🔍   Verifying npm cache\n"
    npm cache verify
    echo ""
 fi

-#if [[ $1 == "--npm_cleanup" ]]; then
-if [[ $1 == "--cleanup" ]]; then
-	echo "npm cache clean"
-	# As of npm@5, the npm cache self-heals from corruption issues and data extracted from the cache is guaranteed to be valid. 
-	# If you want to make sure everything is consistent, use 'npm cache verify' instead. 
-	# On the other hand, if you're debugging an issue with the installer, you can use `npm install --cache /tmp/empty-cache` to use a temporary cache instead of nuking the actual one.
-	# If you're sure you want to delete the entire cache, rerun this command with --force.
-
-    if printf '%s\n%s\n' "$(npm --version)" 5.0.0 | sort --version-sort --check=silent; then
-        echo "🌿  Cleaning npm cache"
-    	npm cache clean
-    fi
 echo ""
-fi
-
-echo ""
-
-
-
-
--- a/plugins.d/pecl.sh
+++ b/plugins.d/pecl.sh
@@ -10,10 +10,19 @@
 # Settings:

 # No distract mode (no user interaction)
-no_distract=false
+[[ $@ =~ "--nodistract" ]] && no_distract=true || no_distract=false
 #
 #########################################

+italic="\033[3m"
+underline="\033[4m"
+ita_under="\033[3;4m"
+bgd="\033[1;4;31m"
+red="\033[1;31m"
+bold="\033[1m"
+box="\033[1;41m"
+reset="\033[0m"
+
 notification() {
    sound="Basso"
    title="Homebrew"
@@ -27,15 +36,11 @@ notification() {
 }


-if [[ $1 == "--nodistract" ]]; then
-	no_distract=true
-fi
-
-echo -e "\033[1m🐘 pecl \033[0m"
+echo -e "${bold}🐘 pecl ${reset}"

 echo ""

-echo -e "\033[1m❗️ plugin en test (beta) \033[0m"
+echo -e "${bold}❗️ plugin en test (beta) ${reset}"
 echo ""

 # /usr/local/Cellar/php/7.4.11/bin/pecl
@@ -60,7 +65,7 @@ pecl_upgrade=$($php_path/pecl list-upgrades)

 if [ -n "$pecl_upgrade" ]; then
 	
-	echo -e "\033[4mExtensions update:\033[0m"
+	echo -e "${underline}Extensions update:${reset}"
 	
 	echo ""
 	echo "$pecl_upgrade"
@@ -117,11 +122,11 @@ notif2="$conf_php was modified in the last 5 minutes"
 test=$(find "$dir" -name "$name" -mmin -5 -maxdepth 1)

 if [ -n "$test" ]; then
-	echo -e "\033[1;31m❗️ ️$notif2\033[0m"
+	echo -e "${red}❗️ ️$notif2${reset}"
 	notification "$notif2"
 	echo ""
 	
-	a=$(echo -e "Do you want to edit \033[1m$conf_php\033[0m file ? (y/n)")
+	a=$(echo -e "Do you want to edit ${bold}$conf_php${reset} file ? (y/n)")
 	read -p "$a" choice
 	if [ "$choice" == "y" ]; then
 		$EDITOR "$conf_php"
--- a/plugins.d/pip.sh
+++ b/plugins.d/pip.sh
@@ -13,37 +13,47 @@
 #
 # Settings:

+# Display info on updated pakages / casks
+#[[ $@ =~ "--info" ]] && display_info=false || display_info=true
+display_info=true
+
+# No distract mode (no user interaction)
+[[ $@ =~ "--nodistract" ]] && no_distract=true || no_distract=false
+
+# Display dependancies on updated pakages / casks
+#[[ $@ =~ "--depend" ]] && display_depend=false || display_depend=true
+display_depend=true
+
 #version: pip ou pip3
 # pip: python3.8 - pip3: python3.9
 pip_version=pip3
 #user: "" or "--user"
 user=""
-# No distract mode
-no_distract=false
-#add module to do_not_update array
+
+# Add module to the do_not_update array for prevent to update.
 #declare -a do_not_update=()
 #declare -a do_not_update=("parso" "asgiref")
 declare -a do_not_update=("asgiref")
 #
 #########################################

+: <<'END_COMMENT'
+blabla
+END_COMMENT
+
 italic="\033[3m"
 underline="\033[4m"
+ita_under="\033[3;4m"
 bold="\033[1m"
+bold_under="\033[1;4m"
 redbox="\033[1;41m"
 redbold="\033[1;31m"
 red="\033[31m"
 yellow="\033[33m"
 reset="\033[0m"

-if [[ $1 == "--nodistract" ]]; then
-	no_distract=true
-fi
-
-if ! [ -x "$(command -v $pip_version)" ]; then
-	echo "Error: $pip_version is not installed." >&2
-	exit 1
-fi
+command -v pipdeptree >/dev/null 2>&1 || { echo -e "You shoud intall ${bold}pipdeptree${reset} for checking packages dependancies ${italic}($pip_version install pipdeptree)${reset}.\n"; }
+command -v $pip_version >/dev/null 2>&1 || { echo -e "${bold}$pip_version${reset} is not installed." && exit 1; }

 echo -e "${bold}🐍  $pip_version (Python 3) ${reset}"

@@ -52,88 +62,85 @@ echo ""
 echo -e "Current ${underline}Python3${reset} version: $(python3 -V | awk '{print $2}')"
 echo -e "Current ${underline}pip3${reset} version: $(pip3 -V)"

-#$pip_version install --upgrade pip
-$pip_version install --upgrade pip > /dev/null
+#$pip_version install --upgrade pip > /dev/null
 echo ""

+# Do not update casks
 if (( ${#do_not_update[@]} )); then

 	nbp=${#do_not_update[*]}
 	
 	echo -e "${underline}List of${reset} ${redbox} $nbp ${reset} ${underline}'do not update' packages:${reset}"
 	echo -e "${redbold}${do_not_update[*]}${reset}"
-	echo "To remove package from this list, you need to edit the do_not_update array."
+	echo -e "To remove package from this list, you need to edit the ${italic}do_not_update${reset} array."
 	echo ""

 fi

+
+#Packages update	
+echo -e "🐍 ${underline}Search for packages update...${reset}\n"
+
 pip_outdated=$($pip_version list --outdated --format columns)
 upd=$(echo "$pip_outdated" | sed '1,2d' | awk '{print $1}')
+#upd="asgiref CairoSVG setuptools"

+# Find infos about updated packages
 if [ -n "$upd" ]; then

 	nb=$(echo "$upd" | wc -w | xargs)

 	echo -e "${redbox} $nb ${reset} ${underline}availables updates:${reset}"
-	#echo $pip3_outdated_freeze | tr [:space:] '\n'
-	echo "$pip_outdated"
+	echo -e "\n$pip_outdated"
 	echo ""
 	
 	for i in $upd
 	do
 		info=$($pip_version show "$i")
-			echo "$info" | head -4
+		
+		l=$(echo "$info" | sed -n '1p')
+		m=$(sed "1s/.*/\\${bold}$l\\${reset}/" <<< "$info")
+		echo -e "$m"  | head -4
 		echo ""
+		
+		z+="$i "
+		
 	done

-	if [ -x "$(command -v pipdeptree)" ]; then
-		echo -e "${underline}Check dependancies:${reset}"
-		echo "Be carefull!! This updates can be a dependancie for some modules. Check for any incompatible version."
-	fi
-	echo ""
-	for i in $upd
-		do
-			if [ -x "$(command -v pipdeptree)" ]; then
-				dependencies=$(echo "$i" | xargs pipdeptree -r -p | grep "$upd")
+	# Check dependancies
+	if [ -x "$(command -v pipdeptree)" ] && [ "$display_depend" == true ]; then
 	
-				#asgiref==3.2.10
-  				#	- Django==3.1.2 [requires: asgiref~=3.2.10]
+		echo -e "🐍 ${underline}Check dependancies:${reset}\n"
+		echo -e "Be carefull!! This updates can be a dependancie for some modules. Check for any incompatible version.\n"
 	
-  				#parso==0.7.1
- 				#	 - jedi==0.17.2 [requires: parso>=0.7.0,<0.8.0]
+		z=$(echo "$z" | sed 's/.$//' | sed 's/ /,/g')
+		dependencies=$(echo "$z" | xargs pipdeptree -r -p )

-				z=0
-				while read -r line; do
-					if [[ $line = *"<"* ]]; then
-						echo -e "${red}$line${reset}"
-					elif [[ $line = *"~="* ]]; then
-						echo -e "${yellow}$line${reset}"
+		while IFS= read -r line; do
+			z=$(echo "${line}" | grep -i ^[a-z])
+			if [ -n "$z" ] ; then
+				echo -e "\n${bold}${line}${reset}"
+			elif [[ "${line}" = *"<"* ]]; then
+				echo -e "${red}${line}${reset}"
+			elif [[ "${line}" = *"~="* ]]; then
+				echo -e "${yellow}${line}${reset}"
 			else
-						if [ "$z" -eq 0 ]; then
-							echo -e "${italic}$line${reset}"
-						else
-							echo "$line"
-						fi
-						z=$((z+1))
+				echo "${line}"
 			fi
 		done <<< "$dependencies"
-				echo ""
-				
-			else
-				c=$(echo -e "Do you want to install pipdeptree to check dependancies ? (y/n)")
-  				read -pr "$c" choice
-  				case "$choice" in
-    				y|Y|o ) $pip_version install $user pipdeptree ;;
-    				n|N ) echo "Ok, let's continue";;
-    				* ) echo "invalid";;
-  				esac

 	fi

-			# If the update is not in the do_not_update array, we install it.

-			FOUND=`echo ${do_not_update[*]} | grep "$i"`
-			if [ "${FOUND}" = "" ] && [ "$no_distract" = false ]; then
+	# Updating packages
+	echo -e "\n🐍 ${underline}Updating packages...${reset}\n"
+
+	[ "${#do_not_update[@]}" -gt 0 ] && echo -e "${redbold}Do not update: ${underline}${do_not_update[@]}${reset}${redbold} . It won't be updated!'${reset}\n"
+	
+	for i in $upd
+	do
+		if [[ ! " ${do_not_update[@]} " =~ " ${i} " ]]; then
+			if [ "$no_distract" = false ]; then

 		 		b=$(echo -e "Do you wanna run ${bold}$pip_version install $user --upgrade $i${reset} ? (y/n)")
  				read -p "$b" choice
@@ -144,10 +151,9 @@ if [ -n "$upd" ]; then
  				esac
  				echo ""

-			elif  [ "${FOUND}" = "" ]; then
-			
+		 	else
 				echo "$i" | xargs $pip_version install $user --upgrade
-				
+			fi
 		fi
 	done
 	
@@ -155,8 +161,9 @@ else
 	echo -e "${underline}No availables updates.${reset}"
 fi

+
 echo ""
-echo -e "🐍  Running ${bold}pip check${reset} for checking that everything is ok."
+echo -e "🐍 ${underline}Running ${reset}${bold_under}pip check${reset}${underline} for checking that everything is ok...${reset}\n"

 $pip_version check
Author	SHA1	Message	Date
Bruno 21	a32a0d6ded	5 scripts +update colors strings +update parameter ‘—nodistract’	2021-01-09 15:05:29 +01:00
Bruno 21	9d8b924a30	node.sh install.sh minor bugfixs	2021-01-09 14:13:24 +01:00
Bruno 21	a5c0c2b011	antibody.sh +antibody version	2021-01-09 14:12:29 +01:00
Bruno 21	1061909d5b	pip.sh Rebuild from scratch	2021-01-09 13:04:07 +01:00
Bruno 21	02648b8f83	node.sh +use npm outdated —long instead npm outdated	2021-01-09 13:03:03 +01:00
Bruno 21	e97ae7ec2c	homebrew.sh +minor dialog corrections	2021-01-09 13:00:28 +01:00
Bruno 21	064ae0ecf0	homebrew.sh Bugfix: -nb de cask -brew info —cask et brew upgrade —cask (pour les casks comme docker qui existe aussi en formula	2021-01-07 17:36:36 +01:00
Bruno 21	cb0a07339d	node.sh Features: +rebuild from scratch +info on updated modules	2021-01-06 11:30:19 +01:00
Bruno 21	560bb5e13b	homebrew.sh Release version 2.0	2021-01-05 16:57:13 +01:00
Bruno 21	64264174b4	homebrew.sh Feature: +info casks latest	2021-01-05 11:49:28 +01:00
Bruno 21	6b4dfb2abb	homebrew.sh Feature: +test if Apache conf file has been modified by Homebrew	2021-01-04 18:57:50 +01:00
Bruno 21	1d2a6b5e3b	homebrew.sh Features: +display number of updates +message about required (jq) or recommended (terminal-notifier) softwares Cleaning code.	2021-01-04 18:51:57 +01:00
Bruno 21	f337e0c62b	homebrew.sh build from scratch: +add descriptions for packages/casks	2021-01-04 08:52:05 +01:00
Bruno 21	3e88dc59df	homebrew.sh rebuild from scratch	2021-01-03 10:04:05 +01:00
Bruno 21	e6fb194868	homebrew.sh +update comments	2021-01-03 09:59:24 +01:00