getDestFile: replace with placeholder AFTER sanitizeFile (who mangles our placeholder)

checkmissing: add missing read -d \0
cleandestinations: use NULL separator in find, use SQL placedholmder

CHANGELOG.md

@@ -1,11 +1,5 @@
-# 1.0.6
-### BUGS
+# DEV
 * Support for newline character in filenames
-* Fix obsolete files deletion
-
-### BUGS (Minor)
-* Fix timing information
-* Fix level 3+ debug levels (hanging waiting for child processes)
 
 # 1.0.5
 ### BUGS (Minor)

README.md

@@ -32,7 +32,7 @@ Here's what I have for my tests:
 
 * URL: https://framagit.org/atom/AtOM/
 * Author: Vincent Riquer <vincent+prog.atom@riquer.fr>
-* Copyright/left: 2012-2013,2015,2025-2026 Vincent Riquer - GPLv3
+* Copyright/left: 2012-2013,2015,2025 Vincent Riquer - GPLv3
 
 ## Dependencies
 ### Required:

atom

@@ -224,8 +224,8 @@ do
 	do
 		removeFileId=${line%%::AtOM:SQL:Sep::*}
 		rest=${line#*::AtOM:SQL:Sep::}
-		removeFileDestName=${rest%%::AtOM:SQL:Sep::*}
-		rest=${rest#*::AtOM:SQL:Sep::}
+		removeFileDestName=${line%%::AtOM:SQL:Sep::*}
+		rest=${line#*::AtOM:SQL:Sep::}
 		removefile[$removeFileId]="${destinationpath["$removeFileDestName"]}/${rest%%::AtOM:SQL:Sep::*}"
 		read -u4 -r -d $'\0' line
 	done
@@ -239,7 +239,7 @@ do
 	filename=${removefile[id]}
 	if [ -n "$filename" ]
 	then
-		if rm "$filename"
+		if rm -f "$filename"
 		then
 			Delete destination_files <<<"id = $id"
 			(( ++deleted ))

lib/database/checkVersion

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-currentdbversion=8
+currentdbversion=7
 checkDatabaseVersion() {
 	local dbversion
 	if dbversion=$(Select atom version <<<"\"1\" = 1")
@@ -15,9 +15,9 @@ checkDatabaseVersion() {
 				dbversion=$(Select atom version <<<"\"1\" = 1")
 			done
 		else
-			echo "Database schema version $dbversion is"	\
-				"higher thanthat of this version of"	\
-				"AtOM ($currentdbversion). Bailing out." >&2
+			echo "Database schema version $dbversion is higher than
+				that of this version of AtOM
+				($currentdbversion). Bailing out." >&2
 			exit $EDBVERSION
 		fi
 	else

lib/database/upgradedatabase_7_8

@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-upgradedatabase_7_8() {
-	echo "Upgrading database to version 8... (backup is $database.bak_v7)"
-        cp "$database" "$database.bak_v7"
-        echo 'Deletion of old files was failing. Users of previous versions (YOU!) are strongly advised to run cleandestinations with the "-r" flag.'
-        read -p "Press Enter to continue..."
-        Update atom version 8 <<<"1 = 1"
-}