lib/copy/matching

@@ -1,15 +1,13 @@
 #!/bin/bash
 copyFiles_matching() {
-	local extension="${filename##*.}"
-	if					\
+	extension="${filename##*.}"
 	cp -al					\
 		"$sourcepath/$filename"		\
-		"${destinationpath[$destination]}/$destdir/$destfile.$extension"	\
+		"$destdir/$destfile.$extension"	\
 		2>/dev/null			\
 	|| cp -a				\
 		"$sourcepath/$filename"		\
-		"${destinationpath[$destination]}/$destdir/$destfile.$extension"
-	then
+		"$destdir/$destfile.$extension"
 	echo								\
 		"UPDATE	destination_files"				\
 		"SET filename="						\
@@ -25,12 +23,11 @@ copyFiles_matching() {
 		"		WHERE id=$destfileid"			\
 		"	),"						\
 		"	rename_pattern="				\
-	"\"${destinationrenamepath[$destination]}/${destinationrename[$destination]}\","\
+"\"${destinationrenamepath[$destination]}/${destinationrename[$destination]}\","\
 		"	fat32compat="					\
 		"${destinationfat32compat["$destination"]},"		\
-			"	ascii=${destinationascii["$destination"]}"\
+		"	ascii=${destinationascii["$destination"]}"	\
 		"WHERE  id=$destfileid;"				\
 		>&3
 	(( ++copies ))
-	fi
 }

lib/files/getDestDir

@@ -98,7 +98,7 @@ getDestDir() {
 			part=${part#*/}
 		done
 	fi
-	if ! [ -d "${destinationpath[$destination]}/$destdir" ]
+	if ! [ -d "$destdir" ]
 	then
 		mkdir -p "${destinationpath[$destination]}/$destdir"
 	fi