Merge branch '28-store-dest-filename-relative' into 'dev'

Resolve "Store dest filename relative"

See merge request atom/AtOM!38

lib/copy/matching

@@ -1,13 +1,15 @@
 #!/bin/bash
 copyFiles_matching() {
-	extension="${filename##*.}"
+	local extension="${filename##*.}"
+	if					\
 	cp -al					\
 		"$sourcepath/$filename"		\
-		"$destdir/$destfile.$extension"	\
+		"${destinationpath[$destination]}/$destdir/$destfile.$extension"	\
 		2>/dev/null			\
 	|| cp -a				\
 		"$sourcepath/$filename"		\
-		"$destdir/$destfile.$extension"
+		"${destinationpath[$destination]}/$destdir/$destfile.$extension"
+	then
 		echo							\
 			"UPDATE	destination_files"			\
 			"SET filename="					\
@@ -23,11 +25,12 @@ 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 "$destdir" ]
+	if ! [ -d "${destinationpath[$destination]}/$destdir" ]
 	then
 		mkdir -p "${destinationpath[$destination]}/$destdir"
 	fi