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

Resolve "Store dest filename relative"

See merge request atom/AtOM!38

lib/copy/matching

@@ -1,33 +1,36 @@
 #!/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"
-	echo								\
+	then
-		"UPDATE	destination_files"				\
+		echo							\
-		"SET filename="						\
+			"UPDATE	destination_files"			\
-	"\"${destdir//\"/\"\"}/${destfile//\"/\"\"}.$extension\"," 	\
+			"SET filename="					\
-		"	last_change=("					\
+		"\"${destdir//\"/\"\"}/${destfile//\"/\"\"}.$extension\"," \
-		"		SELECT last_change"	 		\
+			"	last_change=("				\
-		"		FROM source_files" 			\
+			"		SELECT last_change"	 	\
-		"		WHERE id=$fileid"			\
+			"		FROM source_files" 		\
-		"	),"						\
+			"		WHERE id=$fileid"		\
-		"	old_filename=("					\
+			"	),"					\
-		"		SELECT filename"			\
+			"	old_filename=("				\
-		"		FROM destination_files"			\
+			"		SELECT filename"		\
-		"		WHERE id=$destfileid"			\
+			"		FROM destination_files"		\
-		"	),"						\
+			"		WHERE id=$destfileid"		\
-		"	rename_pattern="				\
+			"	),"					\
-"\"${destinationrenamepath[$destination]}/${destinationrename[$destination]}\","\
+			"	rename_pattern="			\
-		"	fat32compat="					\
+	"\"${destinationrenamepath[$destination]}/${destinationrename[$destination]}\","\
-		"${destinationfat32compat["$destination"]},"		\
+			"	fat32compat="				\
-		"	ascii=${destinationascii["$destination"]}"	\
+			"${destinationfat32compat["$destination"]},"	\
-		"WHERE  id=$destfileid;"				\
+			"	ascii=${destinationascii["$destination"]}"\
-		>&3
+			"WHERE  id=$destfileid;"			\
-	(( ++copies ))
+			>&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