fix "&" and special characters in filename

atom

@@ -616,7 +616,7 @@ do
 	rest=${line#*::AtOM:SQL:Sep::}
 	filename=${rest%%::AtOM:SQL:Sep::*}
 	oldfilename=${rest#*::AtOM:SQL:Sep::}
-	if [[ $oldfilename != $filename ]] && [ -f "$oldfilename" ]
+	if [[ $oldfilename != "$filename" ]] && [ -f "$oldfilename" ]
 	then
 		rm -f "$oldfilename"
 	fi

lib/encode/encodeFile::mp3

@@ -51,7 +51,12 @@ encodeFile::mp3() {
 			$(
 				for key in ${!lameopts[@]}
 				do
-					echo "cmd_arg$key ${lameopts[key]}"
+					cleanedopts="${lameopts[key]//\&/\\\&}"
+					cleanedopts="${cleanedopts//\[/\\[}"
+					cleanedopts="${cleanedopts//\]/\\]}"
+					cleanedopts="${cleanedopts//\{/\\{}"
+					cleanedopts="${cleanedopts//\}/\\\}}"
+					echo "cmd_arg$key $cleanedopts"
 				done
 			)
 			cleanup		$tempdir/$tmpfile.wav

lib/encode/encodeFile::opus

@@ -26,7 +26,12 @@ encodeFile::opus() {
 			$(
 				for key in ${!opusencopts[@]}
 				do
-					echo "cmd_arg$key ${opusencopts[key]}"
+					cleanedopts="${opusencopts[key]//\&/\\\&}"
+					cleanedopts="${cleanedopts//\[/\\[}"
+					cleanedopts="${cleanedopts//\]/\\]}"
+					cleanedopts="${cleanedopts//\{/\\{}"
+					cleanedopts="${cleanedopts//\}/\\\}}"
+					echo "cmd_arg$key $cleanedopts"
 				done
 			)
 			cleanup		$tempdir/$tmpfile.wav

lib/encode/encodeFile::vorbis

@@ -22,6 +22,11 @@ encodeFile::vorbis() {
 			$(
 				for key in ${!oggencopts[@]}
 				do
+					cleanedopts="${oggencopts[key]//\&/\\\&}"
+					cleanedopts="${cleanedopts//\[/\\[}"
+					cleanedopts="${cleanedopts//\]/\\]}"
+					cleanedopts="${cleanedopts//\{/\\{}"
+					cleanedopts="${cleanedopts//\}/\\\}}"
 					echo "cmd_arg$key ${oggencopts[key]}"
 				done
 			)

lib/files/sanitizeFile

@@ -27,12 +27,5 @@ sanitizeFile() {
 			string=${string/%+(.)/}
 		fi
 	fi
-	# Not exactly filename sanitity, but these will make the script fail in
-	# a decorative way..
-	string="${string//&/\\&}"
-	strint="${string//;/\\;}"
-	# And these would exhibit strange behaviors
-	string="${string//\[/\\\[}"
-	string="${string//\]/\\\]}"
 	echo "$string"
 }