From b0ba1d2cb992efa6056ecb9b0e5ce9fdb7cc245d Mon Sep 17 00:00:00 2001
From: junos <junos.lukan@ijs.si>
Date: Wed, 9 Nov 2022 13:05:48 +0100
Subject: [PATCH] Format date and time consistently.

The format is chosen to mirror updater.sh.
The ISO format alternative is included as a remark.
---
 prefsCleaner.bat |  7 +++++--
 updater.bat      | 11 +++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/prefsCleaner.bat b/prefsCleaner.bat
index 616ec28..eb05a0b 100644
--- a/prefsCleaner.bat
+++ b/prefsCleaner.bat
@@ -31,8 +31,11 @@ IF NOT EXIST "prefs.js" (CALL :abort "prefs.js not found in the current director
 CALL :strlenCheck
 CALL :FFcheck
 CALL :message "Backing up prefs.js..."
-SET "_time=%time: =0%"
-COPY /B /V /Y prefs.js "prefs-backup-%date:/=-%_%_time::=.%.js"
+FOR /F "usebackq tokens=1,2 delims==" %%i IN (`wmic os get LocalDateTime /VALUE 2^>NUL`) DO IF '.%%i.'=='.LocalDateTime.' SET ldt=%%j
+SET ldt=%ldt:~0,4%-%ldt:~4,2%-%ldt:~6,2%_%ldt:~8,2%%ldt:~10,2%
+REM For ISO format use:
+REM SET ldt=%ldt:~0,4%%ldt:~4,2%%ldt:~6,2%T%ldt:~8,2%%ldt:~10,2%%ldt:~12,6%
+COPY /B /V /Y prefs.js "prefs-backup-%ldt%.js"
 CALL :message "Cleaning prefs.js..."
 CALL :cleanup
 CALL :message "All done!"
diff --git a/updater.bat b/updater.bat
index eef06f0..e7d7fb4 100644
--- a/updater.bat
+++ b/updater.bat
@@ -3,10 +3,10 @@ TITLE arkenfox user.js updater
 
 REM ## arkenfox user.js updater for Windows
 REM ## author: @claustromaniac
-REM ## version: 4.16
+REM ## version: 4.17
 REM ## instructions: https://github.com/arkenfox/user.js/wiki/5.1-Updater-[Options]#-windows
 
-SET v=4.15
+SET v=4.17
 
 VERIFY ON
 CD /D "%~dp0"
@@ -177,8 +177,11 @@ IF EXIST user.js.new (
 		IF DEFINED _singlebackup (
 			MOVE /Y user.js user.js.bak >nul
 		) ELSE (
-			SET "_time=!time: =0!"
-			MOVE /Y user.js "user-backup-!date:/=-!_!_time::=.!.js" >nul
+			FOR /F "usebackq tokens=1,2 delims==" %%i IN (`wmic os get LocalDateTime /VALUE 2^>NUL`) DO IF '.%%i.'=='.LocalDateTime.' SET ldt=%%j
+			SET ldt=%ldt:~0,4%-%ldt:~4,2%-%ldt:~6,2%_%ldt:~8,2%%ldt:~10,2%
+			REM For ISO format use: 
+			REM SET ldt=%ldt:~0,4%%ldt:~4,2%%ldt:~6,2%T%ldt:~8,2%%ldt:~10,2%%ldt:~12,6%
+			MOVE /Y user.js "user-backup-%ldt%.js" >nul
 		)
 		REN user.js.new user.js
 		CALL :message "Update complete."