From feb44c4d04f730a558c961b0cbda7a94ca749652 Mon Sep 17 00:00:00 2001
From: Bruno21 <bruno@clicclac.info>
Date: Sat, 20 Aug 2022 08:41:47 +0200
Subject: [PATCH] shellcheck

-corrections
---
 .gitignore        |  1 +
 keywords2insta.sh | 34 ++++++++++++----------------------
 2 files changed, 13 insertions(+), 22 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e43b0f9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/keywords2insta.sh b/keywords2insta.sh
index 37b5be6..ac02602 100755
--- a/keywords2insta.sh
+++ b/keywords2insta.sh
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 
 
-italic="\033[3m"
+#italic="\033[3m"
 #underline="\033[4m"
-bgd="\033[1;4;31m"
+#bgd="\033[1;4;31m"
 red="\033[1;31m"
 bold="\033[1m"
-bold_under="\033[1;4m"
+#bold_under="\033[1;4m"
 reset="\033[0m"
 
 file=$1
@@ -66,7 +66,6 @@ if [ -z "$k" ]; then
 	exit 1
 fi
 
-# Anemone pulsatilla, Anemone pulsatille, _bleu_
 
 IFS="," read -a key <<< "$k"
 for i in "${key[@]}"
@@ -75,15 +74,14 @@ do
 	if [[ ! "$ii" =~ ^_ ]]; then 
 		
 		if [[ ${dico["$ii"]} ]] ; then
-			k_en=$(echo ${dico["$ii"]})
+			k_en=${dico["$ii"]}
 		else
 			k_en=""
 		fi
 		
-		k_fr=$(echo "$ii")
+		k_fr="$ii"
 
 		if [ -n "$k_en" ]; then
-			echo "fr & en"
 			[[ "$k_fr" = *" "* ]] && keyword_flickr+="\"${k_fr}\" " || keyword_flickr+="${k_fr} "
 			[[ "$k_en" = *" "* ]] && keyword_flickr+="\"${k_en}\" " || keyword_flickr+="${k_en} "
 			keyword_insta+="#${k_fr// /} #${k_en// /} "
@@ -103,9 +101,7 @@ mod+=("${m}")	# Canon EOS R6
 
 if [[ "$m" =~ ^Canon ]]; then
 	mod+=("Canon")											# Canon
-	[[ "$m" =~ *EOS* ]] || mod+=("EOS")						# EOS
-	#mod+=($(echo "$m" | sed 's/Canon\ //g' | sed 's/ //g'))	# EOSR6
-	#mod+=($(echo "$m" | sed 's/EOS//g' | sed 's/ //g')	)	# CanonR6
+	[[ "$m" = *EOS* ]] || mod+=("EOS")						# EOS
 	z=$(echo "$m" | sed 's/Canon\ //g' | xargs)
 	y=$(echo "$m" | sed 's/EOS//g' | sed 's/[ ][ ]*/ /g' | xargs)
 	mod+=("${z}")	# EOS R6
@@ -131,11 +127,8 @@ lens_insta="$(echo "$l" | sed 's/ //g' | sed -r 's/[^ ]+/#&/g') "
 
 
 #fixes
-# #wildlifephotography
 wild=("wildlife" "wildlifephoto" "wildlifephotographer")
-# #natureshots #naturelover #nature
 nat=("naturelovers" "natureshot" "naturephotography")
-# #jura franchecomte
 reg=("Bourgogne" "Burgundy" "Bourgogne Franche-Comté" "Côte d'or")
 
 for i in "${wild[@]}"
@@ -145,7 +138,8 @@ do
 	else
 		wildlife_flickr+="${i} "
 	fi
-	wildlife_insta+="#"$(echo "${i}" | iconv -f UTF-8-MAC -t ascii//translit | sed 's/[^a-zA-Z 0-9]//g' | sed 's/ //g')" "
+	#wildlife_insta+="#"$(echo "${i}" | iconv -f UTF-8-MAC -t ascii//translit | sed 's/[^a-zA-Z 0-9]//g' | sed 's/ //g')" "
+	wildlife_insta+="#$(echo "${i}" | iconv -f UTF-8-MAC -t ascii//translit | sed 's/[^a-zA-Z 0-9]//g' | sed 's/ //g') "
 done
 
 for i in "${nat[@]}"
@@ -155,7 +149,7 @@ do
 	else
 		nature_flickr+="${i} "
 	fi
-	nature_insta+="#"$(echo "${i}" | iconv -f UTF-8-MAC -t ascii//translit | sed 's/[^a-zA-Z 0-9]//g' | sed 's/ //g')" "
+	nature_insta+="#$(echo "${i}" | iconv -f UTF-8-MAC -t ascii//translit | sed 's/[^a-zA-Z 0-9]//g' | sed 's/ //g') "
 done
 
 for i in "${reg[@]}"
@@ -165,7 +159,7 @@ do
 	else
 		region_flickr+="${i} "
 	fi
-	region_insta+="#"$(echo "${i}" | iconv -f UTF-8-MAC -t ascii//translit | sed 's/[^a-zA-Z 0-9]//g' | sed 's/ //g')" "
+	region_insta+="#$(echo "${i}" | iconv -f UTF-8-MAC -t ascii//translit | sed 's/[^a-zA-Z 0-9]//g' | sed 's/ //g') "
 done
 
 : <<'END_COMMENT'
@@ -189,7 +183,7 @@ echo "Region insta: $region_insta"
 echo
 END_COMMENT
 
-keywords_flickr=$(echo "$keyword_flickr$model_flickr$lens_flickr$wildlife_flickr$nature_flickr$region_flickr")
+keywords_flickr="$keyword_flickr$model_flickr$lens_flickr$wildlife_flickr$nature_flickr$region_flickr"
 keywords_insta=$(echo "$keyword_insta$model_insta$lens_insta$wildlife_insta$nature_insta$region_insta" | awk '{print tolower($0)}')
 
 : <<'END_COMMENT'
@@ -226,15 +220,11 @@ else
 fi
 
 
-# flick: éléphant "tic toc" demi-deuil	ok
-
  
 if [[ "$OSTYPE" == "linux-gnu" ]] && [ -x "$(command -v xsel)" ]; then
 	xsel -b <<< "$keywords_insta"
 elif [[ "$OSTYPE" == "darwin"* ]] && [ -x "$(command -v pbcopy)" ]; then
-	#pbcopy <<< "$insta"
-	#echo "$insta"
-	echo "Insta tag's OK !"
+	pbcopy <<< "$keywords_insta"
 fi
 
 echo -e "\n${bold}The Instagram's tags are available in your clipboard !${reset}"