Minors bugfixs

-running hellcheck
-optimize md file

plugins.d/installed.sh

@@ -17,7 +17,6 @@ version=pip3
 now=$(date +"%d-%m-%Y_%T")
 mac=$(hostname -s)
 file=$mac"@"$now
-#echo "$file"
 filename="Installed_$file"
 
 echo -e "\033[1m🛠  Installed \033[0m"
@@ -33,57 +32,67 @@ fi
 
 if [ -f Brewfile ]; then
 	echo -e "The \033[93mBrewfile\033[0m already exist! We rename it."
-	bf=$(find . -name 'Brewfile_*' -maxdepth 1 | xargs rm)
+	find . -name 'Brewfile_*' -maxdepth 1 -print0 | xargs rm
-	d=$(date -r Brewfile  "+%m-%d-%Y_%H:%M:%S")
+	d=$(date -r Brewfile  "+%d-%m-%Y_%H:%M:%S")
 	
 	mv Brewfile "Brewfile_$mac@$d"
 fi
 
-echo '# Apps, package, scripts installed:' > Installed.md
+{
-echo "<u>"$mac"@"$now"</u>" >> Installed.md
+echo '# Apps, package, scripts installed:'
-echo '' >> Installed.md
+echo "*$mac@$now*"
+echo ''
 
-echo '[TOC]' >> Installed.md
+echo '[TOC]'
-echo '' >> Installed.md
+echo ''
 
 # Homebrew
 
-echo '## Homebrew' >> Installed.md
+echo '## 🍺  Homebrew'
-echo '' >> Installed.md
+echo ''
+}  >> Installed.md
 
 echo -e "🍺  Get Homebrew \033[3m\033[93mtap\033[0m list"
 
 echo '### Tap:' >> Installed.md
 tap=$(brew tap)
-echo "\`\`\`bash" >> Installed.md
+{
-echo "$tap" >> Installed.md
+echo "\`\`\`bash"
-echo "\`\`\`" >> Installed.md
+echo "$tap"
-echo "" >> Installed.md
+echo "\`\`\`"
+echo ""
+echo ''
+} >> Installed.md
 
 echo -e "🍺  Get Homebrew \033[3m\033[93mpackages\033[0m installed list"
 	
 echo '### Packages:' >> Installed.md
 brew=$(brew list)
-echo "\`\`\`bash" >> Installed.md
+{
-echo "$brew" >> Installed.md
+echo "\`\`\`bash"
-echo "\`\`\`" >> Installed.md
+echo "$brew"
-echo "" >> Installed.md
+echo "\`\`\`"
+echo ""
+echo ''
+} >> Installed.md
 
 echo -e "🍺  Get Homebrew \033[3m\033[93mCask\033[0m installed list"
 
 echo '### Casks:' >> Installed.md
 cask=$(brew cask list)
-echo "\`\`\`bash" >> Installed.md
+{
-echo "$cask" >> Installed.md
+echo "\`\`\`bash"
-echo "\`\`\`" >> Installed.md
+echo "$cask"
-echo "" >> Installed.md
+echo "\`\`\`"
-
+echo ""
+echo ''
+} >> Installed.md
 
 # liste des apps de l'Appstore installées (nom & numéro)
 
 echo -e "🍏  Get mas \033[3m\033[93mApp Store applications\033[0m list"
 
-echo '## mas (Mac App Store)' >> Installed.md
+echo '## 🍏  mas (Mac App Store)' >> Installed.md
 echo '' >> Installed.md
 
 appfrommas=$(mas list | sort -k2)
@@ -93,91 +102,104 @@ echo "\`\`\`bash" >> Installed.md
 # todo: trier la liste par nom
 while read -r line; do
 	number=$(echo "$line" | awk '{print $1}')
-	name=$(echo "$line" | awk -F  "(" '{print $1}' | awk {'first = $1; $1=""; print $0'} | sed 's/^ //g')
+	#name=$(echo "$line" | awk -F  "(" '{print $1}' | awk {'first = $1; $1=""; print $0'} | sed 's/^ //g')
+	name=$(echo "$line" | awk -F  "(" '{print $1}' | awk '{first = $1; $1=""; print $0}' | sed 's/^ //g')
 	echo "$name ($number)" >> Installed.md
 	#echo " " >> Installed.md
 	#appstore["$name"]="${number}"
 done <<< "$appfrommas"
-echo "\`\`\`" >> Installed.md
+{
-echo "" >> Installed.md
+echo "\`\`\`"
-
+echo ""
+echo ''
+} >> Installed.md
 
 # Extensions PHP PECL
 
 echo -e "🐘  Get PECL \033[3m\033[93mPHP extensions\033[0m list"
 
-echo '## PECL extensions' >> Installed.md
+echo '## 🐘  PECL extensions' >> Installed.md
 echo '' >> Installed.md
 
 ext_pecl=$(pecl list | sed '1,3d' | awk '{print $1}')
-echo "\`\`\`bash" >> Installed.md
+{
-echo "$ext_pecl" >> Installed.md
+echo "\`\`\`bash"
-echo "\`\`\`" >> Installed.md
+echo "$ext_pecl"
-echo "" >> Installed.md
+echo "\`\`\`"
-
+echo ""
+echo ''
+} >> Installed.md
 
 # Python packages (pip)
 
 echo -e "🐍  Get pip \033[3m\033[93mPython 3 packages\033[0m installed list"
-echo '## Python packages' >> Installed.md
+echo '## 🐍  Python packages' >> Installed.md
 echo '' >> Installed.md
 
 pip_packages=$($version list | sed '1,2d' | awk '{print $1}')
-echo "\`\`\`bash" >> Installed.md
+{
-echo "$pip_packages" >> Installed.md
+echo "\`\`\`bash"
-echo "\`\`\`" >> Installed.md
+echo "$pip_packages"
-echo '' >> Installed.md
+echo "\`\`\`"
-
+echo ""
+echo ''
+} >> Installed.md
 
 # atom
 
 echo -e "⚛️   Get \033[3m\033[93mAtom editor packages\033[0m installed list"
-echo '## Atom packages' >> Installed.md
-echo '' >> Installed.md
-
 atom=$(apm list | grep 'Community Packages' -A 100 | sed '1,1d')
+{
+echo '## ⚛️ Atom packages'
+echo ''
+echo "\`\`\`bash"
 
-echo "\`\`\`bash" >> Installed.md	
 while read -r line; do
 	a=$(echo "$line" | awk -F "@" '{print $1}' | awk '{print $2}' )
 	#atom_pkg=${a:4}
-	echo "$a" >> Installed.md	
+	echo "$a"	
 done <<< "$atom"
-echo "\`\`\`" >> Installed.md
-echo '' >> Installed.md
 
+echo "\`\`\`"
+echo ""
+echo ''
+} >> Installed.md
 
 # Node.js packages (npm)
 
-echo '## Node.js packages' >> Installed.md
-echo '' >> Installed.md
-
 echo -e "🌿  Get npm \033[3m\033[93m node global packages\033[0m installed scripts"
-echo '### Global:' >> Installed.md
+pkg_global_npm=$(npm list -g --depth=0 --silent | sed '1d' | awk '{print $2}' | awk -F  "@" '{print $1}')
 
-pkg_global_npm=$(npm list -g --depth=0 --silent | sed '1,2d' | awk '{print $2}' | awk -F  "@" '{print $1}')
+{
-echo "\`\`\`bash" >> Installed.md	
+echo '## 🌿 Node.js packages'
-echo "$pkg_global_npm" >> Installed.md	
+echo ''
-echo "\`\`\`" >> Installed.md
+
+echo '### Global:'
+
+echo "\`\`\`bash"
+echo "$pkg_global_npm"
+echo "\`\`\`"
+} >> Installed.md
 
-#echo "$local_path"
 if [ -d "$local_path" ]; then
-	cd $local_path
+	cd "$local_path" || exit
 
 	echo -e "🌿  Get npm \033[3m\033[93m node local packages\033[0m installed scripts"
 	echo '### Local:' >> "$chemin/Installed.md"
 
-	pkg_local=$(npm ls | sed '1,1d' | grep -v 'deduped')
+	pkg_local=$(npm ls | sed '1d' | grep -v 'deduped')
 
-	echo "\`\`\`bash" >> "$chemin/Installed.md"	
+	{
+	echo "\`\`\`bash"
 	while read -r line; do
-		a=$(echo "$line" | awk -F  "@" '{print $1}')
+		pkg_local_npm=$(echo "$line" | sed 's/[│ └──├┬]//g' | awk -F  "@" '{print $1}')
-		pkg_local_npm=${a:4}
+		echo "$pkg_local_npm"
-		echo "$pkg_local_npm" >> "$chemin/Installed.md"		
 	done <<< "$pkg_local"
-	echo "\`\`\`" >> "$chemin/Installed.md"
+	echo "\`\`\`"
+	} >> "$chemin/Installed.md"
 	
-	cd $chemin
+	
+	cd "$chemin" || exit
 fi
 
 echo "" >> Installed.md
@@ -193,9 +215,10 @@ 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 ''
 
-iconv -f macroman -t utf-8  Installed.md > Installed-utf8.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
-mv Installed-utf8.md "$filename".md
+#rm Installed.md
-rm Installed.md
+
+mv Installed.md "$filename".md
 
 open "$filename".md

plugins.d/mas.sh

@@ -19,8 +19,7 @@ if hash mas 2>/dev/null; then
 	echo ""
 	echo "$massy"
 
-	#if [ -n "$massy" ]; then
+	if [ -n "$(mas outdated)" ]; then
-	if [ ! -z "$(mas outdated)" ]; then
 		echo -e "\033[4mAvailables updates:\033[0m"
 		echo "$massy" | cut -d " " -f2-5
 		echo ""
@@ -28,7 +27,7 @@ if hash mas 2>/dev/null; then
 		if [ "$no_distract" = false ]; then
 	
 			a=$(echo -e "Do you wanna run \033[1mmas upgrade\033[0m ? (y/n)")
-			read -p "$a" choice
+			read -pr "$a" choice
 			case "$choice" in
 				y|Y|o ) mas upgrade;;
 	 		   	n|N ) echo "Ok, let's continue";;

plugins.d/npm.sh

@@ -75,7 +75,7 @@ echo
 
 # Local packages
 if [ -d "$local_path" ]; then
-	cd $local_path
+	cd "$local_path" || return
 	echo -e "\033[4m🌿  Local installed scripts:\033[0m"
 	npm ls
 	outdated=$(npm outdated)

plugins.d/pecl.sh

@@ -77,13 +77,13 @@ fi
 # 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)
+dir=$(dirname "$conf_php")
-name=$(basename $conf_php)
+name=$(basename "$conf_php")
 notif2="$conf_php was modified in the last 5 minutes"
 
-test=$(find $dir -name "$name"  -mmin -500 -maxdepth 1)
+test=$(find "$dir" -name "$name"  -mmin -50000 -maxdepth 1)
 
-if [ ! -z $test ]; then
+if [ -n "$test" ]; then
 	echo -e "\033[1;31m❗️ ️$notif2\033[0m"
 	notification "$notif2"
 	echo ""
@@ -91,7 +91,7 @@ if [ ! -z $test ]; then
 	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
+		$EDITOR "$conf_php"
 	fi
 fi
 

plugins.d/pip.sh

@@ -45,7 +45,7 @@ if [ -n "$upd" ]; then
 	
 	for i in $upd
 		do
-			info=$($version show $i)
+			info=$($version show "$i")
 			#info=$($version show $i | sed -n 4q)
 			#info=$($version show $i | head -5)
 			#info=$($version show $i | tail -n +5)
@@ -80,7 +80,7 @@ if [ -n "$upd" ]; then
 				
 			else
 				c=$(echo -e "Do you want to install pipdeptree to check dependancies ? (y/n)")
-  				read -p "$c" choice
+  				read -pr "$c" choice
   				case "$choice" in
     				y|Y|o ) $version install $user pipdeptree ;;
     				n|N ) echo "Ok, let's continue";;
@@ -94,10 +94,10 @@ if [ -n "$upd" ]; then
 			FOUND=`echo ${do_not_update[*]} | grep "$i"`
 			if [ "${FOUND}" = "" ] && [ "$no_distract" = false ]; then
 			
-				b=$(echo -e "Do you wanna run \033[1m$version install $user --upgrade "$i"\033[0m ? (y/n)")
+				b=$(echo -e "Do you wanna run \033[1m$version install $user --upgrade $i\033[0m ? (y/n)")
   				read -p "$b" choice
   				case "$choice" in
-    				y|Y|o ) echo $i | xargs $version install $user --upgrade ;;
+    				y|Y|o ) echo "$i" | xargs $version install $user --upgrade ;;
     				n|N ) echo "Ok, let's continue";;
     				* ) echo "invalid";;
   				esac
@@ -105,7 +105,7 @@ if [ -n "$upd" ]; then
 
 			elif  [ "${FOUND}" = "" ]; then
 			
-				echo $i | xargs $version install $user --upgrade
+				echo "$i" | xargs $version install $user --upgrade
 				
 			fi			
 		done