Update README.md

-notification si php.ini a été modifié
-option pour éditer le php.ini

README.md

@@ -2,6 +2,10 @@
 altKYMSU is a fork from **KYMSU** (Keep Your macOs Stuff Updated)
 https://github.com/welcoMattic/kymsu
 
+Each plugin notifie you about available update and upgrade apps and packages.
+
+homebrew and pecl plugins notifie you if apache/php configuration files have been modified.
+
 
 
 ## Plug-ins:
@@ -20,7 +24,12 @@ https://github.com/welcoMattic/kymsu
 ## Requirements
 
 - [Homebrew](https://brew.sh/)
-- [pipdeptree](https://pypi.python.org/pypi/pipdeptree) for checking dependancies (pip 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)
 
 
 

plugins.d/homebrew.sh

@@ -9,20 +9,40 @@
 # 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=true
 
-#add module to do_not_update array
+# Casks don't have pinned cask. So add Cask to the do_not_update array for prevent to update.
-declare -a do_not_update=('virtualbox,virtualbox-extension-pack')
+# 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
 #
-#########################################
+###############################################################################################
+#
+# Recommended software (brew install):
+#	-jq (Lightweight and flexible command-line JSON processor)
+#	-terminal-notifier (Send macOS User Notifications from the command-line)
+#
+###############################################################################################
+
+notification() {
+    sound="Basso"
+    title="Homebrew"
+    #subtitle="Attention !!!"
+	message="$1"
+	image="error.png"
+
+	if [[ "$OSTYPE" == "darwin"* ]] && [ -x "$(command -v terminal-notifier)" ]; then
+    	terminal-notifier -title "$title" -message "$message" -sound "$sound" -contentImage "$image"
+	fi
+}
+
 
 if [[ $1 == "--nodistract" ]]; then
 	no_distract=true
@@ -34,74 +54,210 @@ brew update
 
 echo ""
 
-brew_outdated=$(brew outdated)
+# Pinned packages
-upd3=$(echo "$brew_outdated" | awk '{print $1}')
 
-#nb=$(echo $upd3 | wc -w)
+brew_pinned=$(brew list --pinned | xargs)
+#brew_pinned=`echo $brew_pinned | sed 's/ *$//g'`
+#brew_pinned=`echo $brew_pinned | xargs`
+
+if [ -n "$brew_pinned" ]; then
+
+	nbp=$(echo "$brew_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$brew_pinned\033[0m"
+	echo "To update a pinned package, you need to un-pin it manually (brew unpin <formula>)"
+	echo ""
+
+fi
+
+# A pinned package is in 'brew outdated'
+
+declare -A array_info
+
+if [ -x "$(command -v jq)" ]; then
+	brew_outdated=$(brew outdated --json)	
+	upd_json=$(echo "$brew_outdated" )
+	
+	for row in $(jq -c '.[]' <<< "$upd_json");
+	do
+		name=$(echo "$row" | jq -j '.name, "\n"'); 
+		upd3+="$name "
+	done
+	upd3=$(echo "$upd3" | sed 's/.$//')
+	
+	# Only 1 request 'brew info' for all updated packages
+	info=$(brew info --json=v1 $upd3)
+	
+	i=0
+	for row in $(echo "${info}" | jq -r '.[] | @base64');
+	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')
+		#linked=$(_jq '.linked_keg')
+
+		eval "declare -a array_info$i=($name $homepage $desc $pinned $installed_v $stable)"
+
+		((i++))
+	done
+	nb=$i
+	i=0
+
+else
+	brew_outdated=$(brew outdated)	
+	upd3=$(echo "$brew_outdated" | awk '{print $1}')
+	
+	info=$(brew info $upd3)
+	for i in $upd3
+	do
+		a=$(grep -A 3 "$i: stable" <<< "$info")
+		array_info["$i"]="$a"
+	done
+	nb=${#array_info[@]}
+fi
+
+# Get infos for all updated packages
 
 if [ -n "$upd3" ]; then
 		
+	# Display info on outdated packages
+	
 	if [ "$display_info" = true ]; then
-		echo -e "\033[4mInfo on updated packages:\033[0m"
+		echo -e "\033[4mInfo on\033[0m \033[1;41m $nb \033[0m \033[4mupdated packages:\033[0m"
-		for pkg in $upd3
-		do
 		
-			# if jq (https://stedolan.github.io/jq/) is installed
+		if [ -x "$(command -v jq)" ]; then
-			if [ -x "$(command -v jq)" ]; then
+		# ok avec jq installé
-				info_pkg=$(brew info --json=v1 "$pkg")
-				current=$(echo "$info_pkg" | jq -r .[].installed[].version | tail -n 1 | awk '{print $1}')
-				stable=$(echo "$info_pkg" | jq -r .[].versions.stable)
-				homepage=$(echo "$info_pkg" | jq -r .[].homepage)
-				desc=$(echo "$info_pkg" | jq -r .[].desc)
 		
-				echo -e "\033[1m$pkg:\033[0m current: $current last: $stable"		
+			i=0
-				echo "$desc"
+			for row in $(jq -c '.[]' <<< "$upd_json");
-				echo "$homepage"		
-
-			else
-				info=$(brew info $pkg | head -n 4)
-				ligne1=$(echo "$info" | head -n 1)
-				
-				echo -e "\033[1m$ligne1\033[0m"					
-				echo "$info" | sed -n -e '2,3p'
-			
-			fi
-
-			echo ""
-		done
-	fi
-	if [ "$no_distract" = false ]; then
-	
-		a=$(echo -e "Do you wanna run \033[1mbrew upgrade "$upd3"\033[0m? (y/n)")
-		read -p "$a" choice
-		#case "$choice" in
-		#	y|Y ) echo "$brew_outdated" | awk '{print $1}' | xargs -p -n 1 brew upgrade ;;
-  		#  	n|N ) echo "Ok, let's continue";;
-    	#	* ) echo "invalid";;
-		#esac
-		
-		if [ "$choice" == "y" ]; then
-		
-			for i in $upd3
 			do
-				FOUND=`echo ${do_not_update[*]} | grep "$i"`
+			
-				if [ "${FOUND}" = "" ]; then
+				name=$(echo "$row" | jq -j '.name, "\n"'); 
-					echo "$i" | awk '{print $1}' | xargs -p -n 1 brew upgrade
+				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)
+				
+				#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)
+				
+				upd+="$name "
+					
+				if [ "$pinned" = "true" ]; then echo -e "\033[1;31m$name: installed: $installed_v stable: $current_v [pinned at $pinned_v]\033[0m";
+				else echo -e "\033[1;37m$name: installed: $installed_v stable: $current_v\033[0m";
 				fi
+				if [ "$desc" != "null" ]; then echo "$desc"; fi;
+				echo -e "\033[4m$homepage\033[0m"
+				echo ""
+				
+				((i++))
 			done
+			upd3=$upd
 		else
-			echo "Ok, let's continue"		
+		# ok sans jq
+		
+			for pkg in $upd3
+			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
 
-	else
+	fi
 	
-		echo "$brew_outdated" | awk '{print $1}' | xargs -n 1 brew upgrade
+	# Usefull for notify recent modification of apache/mysql/php conf files.
+	touch /tmp/checkpoint
+
+	# Remove pinned packages from outdated packages list
+
+	not_pinned=""
+	for i in $upd3
+	do
+		if [[ $brew_pinned != *"$i"* ]]; then
+		not_pinned+="$i "
+		fi
+	done
+	not_pinned=$(echo "$not_pinned" | sed 's/.$//')
+
+	# Update outdated packages
+	
+	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)")
+			read -p "$a" choice
+			#case "$choice" in
+			#	y|Y ) echo "$brew_outdated" | awk '{print $1}' | xargs -p -n 1 brew upgrade ;;
+  			#  	n|N ) echo "Ok, let's continue";;
+    		#	* ) echo "invalid";;
+			#esac
+		
+			if [ "$choice" == "y" ]; then
+		
+				for i in $not_pinned
+				do	
+					FOUND=`echo ${do_not_update[*]} | grep "$i"`
+					if [ "${FOUND}" = "" ]; then
+							echo "$i" | awk '{print $1}' | xargs -p -n 1 brew upgrade
+							#echo "Running update package $i "
+						#fi
+					fi
+				done
+			else
+				echo "Ok, let's continue"		
+			fi
+		else
+			echo "No package to update"
+		fi
+		
+	else	# no distract = true
+	
+		if [ -n "$not_pinned" ]; then
+			echo "$not_pinned" | awk '{print $1}' | xargs -n 1 brew upgrade
+			#echo "Running update package $not_pinned"
+		else
+			echo "No package to update"
+		fi
 		
 	fi
 	
 	echo ""
 fi
 
+# Casks
+
 echo "🍺  Casks upgrade."
 
 cask_outdated=$(brew cask outdated --greedy --verbose)
@@ -148,21 +304,44 @@ if [ -n "$latest" ] && [ "$no_distract" = false ]; then
 fi
 echo ""
 
-echo "🍺  ️The Doc is checking that everything is ok."
-brew doctor
-brew missing
-echo ""
-
 # 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}')
 dir=$(dirname $conf_apa)
 name=$(basename $conf_apa)
+notif1="$dir has been modified in the last 5 minutes"
 
-test=$(find $dir -name "$name"  -mmin -5 -maxdepth 1)
+test=$(find $dir -name "$name" -mmin -5 -maxdepth 1)
-[ ! -z $test ] && echo -e "\033[1;31m❗️ ️$name was modified in the last 5 minutes\033[0m"
+[ ! -z $test ] && echo -e "\033[1;31m❗️ ️$notif1\033[0m"
+[ ! -z $test ] && notification "$notif1"
 
+# Test if PHP.ini file has been modified by Homebrew (PECL)
+
+php_versions=$(ls /usr/local/etc/php/)
+for php in $php_versions
+do 	
+	# file modified since it was last read
+	#if [ -N /usr/local/etc/php/$php/php.ini ]; then echo "modified"; fi
+	
+	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"
+	
+	[ ! -z $php_modified ] && echo -e "\033[1;31m❗️ ️$notif2\033[0m"
+	[ ! -z $php_modified ] && notification "$notif2"
+	
+done
+echo ""
+
+# Doctor
+
+echo "🍺  ️The Doc is checking that everything is ok."
+brew doctor
+brew missing
+status=$?
+if [ $status -ne 0 ]; then brew missing --verbose; fi
+echo ""
 
 # Homebrew 2.0.0+ run a cleanup every 30 days
 

plugins.d/installed.sh

@@ -86,7 +86,7 @@ echo -e "🍏  Get mas \033[3m\033[93mApp Store applications\033[0m list"
 echo '## mas (Mac App Store)' >> Installed.md
 echo '' >> Installed.md
 
-appfrommas=$(mas list)
+appfrommas=$(mas list | sort -k2)
 #echo "$appfrommas"
 #declare -a appstore
 echo "\`\`\`bash" >> Installed.md
@@ -139,9 +139,9 @@ atom=$(apm list | grep 'Community Packages' -A 100 | sed '1,1d')
 
 echo "\`\`\`bash" >> Installed.md	
 while read -r line; do
-	a=$(echo "$line" | awk -F  "@" '{print $1}')
+	a=$(echo "$line" | awk -F "@" '{print $1}' | awk '{print $2}' )
-	atom_pkg=${a:4}
+	#atom_pkg=${a:4}
-	echo "$atom_pkg" >> "$chemin/Installed.md"		
+	echo "$a" >> Installed.md	
 done <<< "$atom"
 echo "\`\`\`" >> Installed.md
 echo '' >> Installed.md
@@ -193,6 +193,9 @@ echo ''
 echo -e "To restore everything listed in that file, run \033[3m\033[93m'$ brew bundle'\033[0m in folder that contains the Brewfile."
 echo ''
 
-mv Installed.md "$filename".md
+iconv -f macroman -t utf-8  Installed.md > Installed-utf8.md
+#iconv -s -f macroman -t utf-8 Installed.md
+mv Installed-utf8.md "$filename".md
+rm Installed.md
 
 open "$filename".md

plugins.d/pecl.sh

@@ -14,6 +14,19 @@ no_distract=false
 #
 #########################################
 
+notification() {
+    sound="Basso"
+    title="Homebrew"
+    #subtitle="Attention !!!"
+	message="$1"
+	image="error.png"
+
+	if [[ "$OSTYPE" == "darwin"* ]] && [ -x "$(command -v terminal-notifier)" ]; then
+    	terminal-notifier -title "$title" -message "$message" -sound "$sound" -contentImage "$image"
+	fi
+}
+
+
 if [[ $1 == "--nodistract" ]]; then
 	no_distract=true
 fi
@@ -59,14 +72,28 @@ if [ -n "$pecl_upgrade" ]; then
 	fi
 fi
 
+# si modif des extensions, les .ini dans conf.d/ ne sont pas modifiés, juste le php.ini
+
 # php.ini a été modifié il y a moins de 5mn
 v_php=$(php --info | grep -E 'usr.*ini')
 conf_php=$(echo "$v_php" | grep 'Loaded Configuration File' | awk '{print $NF}')
 dir=$(dirname $conf_php)
 name=$(basename $conf_php)
+notif2="$conf_php was modified in the last 5 minutes"
 
-test=$(find $dir -name "$name"  -mmin -5 -maxdepth 1)
+test=$(find $dir -name "$name"  -mmin -500 -maxdepth 1)
-[ ! -z $test ] && echo -e "\033[1;31m❗️ ️$name was modified in the last 5 minutes\033[0m"
+
+if [ ! -z $test ]; then
+	echo -e "\033[1;31m❗️ ️$notif2\033[0m"
+	notification "$notif2"
+	echo ""
+	
+	a=$(echo -e "Do you want to edit \033[1m$conf_php\033[0m file ? (y/n)")
+	read -p "$a" choice
+	if [ "$choice" == "y" ]; then
+		$EDITOR $conf_php
+	fi
+fi
 
 echo ""
 echo ""