bugsfix

keywords2insta.sh

@@ -265,8 +265,12 @@ if [[ -n $iso ]] && [[ -n $speed ]] && [[ -n $aperture ]]; then
 	printf " %-10s  %-35s \n" "ISO:" "${iso}"
 	printf " %-10s  %-35s \n" "Date:" "${date_original}"
 	printf " %-10s  %-35s \n" "Maker:" "${make}"
-	[[ "$make" =~ ^SONY ]] && alpha
+	if [[ "$make" =~ ^SONY ]]; then
-	printf " %-10s  %-35s \n" "APN:" "$alpha_name (${model})"
+		alpha
+		printf " %-10s  %-35s \n" "APN:" "$alpha_name (${model})"
+	else
+		printf " %-10s  %-35s \n" "APN:" "${model}"
+	fi
 	printf " %-10s  %-35s \n" "Focal:" "${focal}"
 	if [[ -n $lensID ]]; then
 		printf " %-10s  %-35s \n" "LensID:" "${lensID}"
@@ -369,17 +373,19 @@ done
 #	"Make": "Canon",
 #	"Model": "Canon EOS R7",
 
-#mod=("${model}")
+if [[ "$make" =~ ^Panasonic ]] || [[ "$make" =~ ^FUJI ]]; then
-#m=("${model}")
-
-#echo "mod:${mod[@]}_"
-#echo "m:${m[@]}_"
-
-if [[ "$make" =~ ^Panasonic ]] || [[ "$make" =~ ^SONY ]] || [[ "$make" =~ ^FUJI ]]; then
 	mod=("${make} ${model}")
 	mod+=("${make}")
 	mod+=("${model}")
 	mod+=("${make,,}photography")
+elif [[ "$make" =~ ^SONY ]]; then
+	mod=("${make} ${model}")
+	mod+=("${make}")
+	mod+=("${model}")
+	# convertir α en Alpha
+	q=$(echo "${alpha_name}" | sed 's/α/Alpha /')
+	mod+=("$q")
+	mod+=("${make,,}photography")
 elif [[ "$make" =~ ^"OM Digital Solutions" ]]; then
 	mod=("${make} ${model}")					# OM Digital Solutions OM-5
 	mod+=("Olympus")							# Olympus
@@ -391,7 +397,6 @@ elif [[ "$model" =~ ^NIKON ]] || [[ "$model" =~ ^LEICA ]]; then
 	mod+=("${z}photography")					# nikonphotography 	leicaphotography
 	mod+=("${y}")								# NIKON 			LEICA
 	mod+=("${model}")							# NIKON Z 9			LEICA Q3
-	# awk -F"|" '{$1=$2=$3=""; print $0}' PURCHASE_testing.csv > testing.csv
 	w=$(echo "${model}" | awk '{$1=""; print $0}' | xargs)
 	mod+=("${w}")
 elif [[ "$model" =~ ^Canon ]]; then
@@ -404,8 +409,6 @@ elif [[ "$model" =~ ^Canon ]]; then
 	mod+=("${y}")	# Canon R6
 fi
 
-#echo "mod:${mod[@]}_"
-
 for i in "${mod[@]}"
 do
 	#model+="${i} "