Correct ~/.local/config/... to ~/.config/... when looking for sqliterc when XDG_CONFI...

FossilOrigin-Name: ebb346c5aa427b9e84a035278ee245d54810d9954efef12b898f2d7bc0ff630c

diff --git a/manifest b/manifest
index 3c96f8063df522ade462367afc724d1be7921705..5c85b7714bf5368f23569de9ff81605c5895ae65 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssupport\sfor\susing\s$XDG_STATE_HOME/sqlite_history\sor\s~/.local/state/sqlite_history\sbefore\sfallback\sback\sto\sthe\shistorical\sdefault\sof\s~/.sqlite_history.\sUpdate\ssqlite3.1\s(man\spage)\swith\sthe\snew\ssemantics.
-D 2025-06-30T15:21:46.262
+C Correct\s~/.local/config/...\sto\s~/.config/...\swhen\slooking\sfor\ssqliterc\swhen\sXDG_CONFIG_HOME\sis\snot\sset.\sInternal\sdoc\stouchups.
+D 2025-06-30T15:56:10.103
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -786,7 +786,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c d40fe18d7c2fd0339f5846ffcf7d6809866e380acdf14c76fb2af87e9fe13f64
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 882d739e0d5e6c7a8b46a3cca3ada37fe1a56301f1360d6b141312c666bbe482
-F src/shell.c.in 1cf75c1b4aee3fb3dbcedb59c0512977450ada75d2ca00bb08df1adf0055db0b
+F src/shell.c.in 56f3719f22b1dcab01b4c52dc21224bbc46dcc52a0e95407293736fc88fd41c1
 F src/sqlite.h.in 5c54f2461a1ea529bab8499148a2b238e2d4bb571d59e8ea5322d0c190abb693
 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
 F src/sqlite3ext.h 0bfd049bb2088cc44c2ad54f2079d1c6e43091a4e1ce8868779b75f6c1484f1e
@@ -2208,8 +2208,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 69b9244e3ad95edae38d8e66cedafbc1d7724ae0dd72eeee0fdbff913983598e
-R b75f67e480beb6664bd060c4305917e3
+P 6b780655ccd68d068b6ee6621e56ac94c000916b7341651dc79725a0800cd1c0
+R 797b3e78135d622f3aa0a1b4105d4fa3
 U stephan
-Z 13d46cdb1a0ac8d1c628b18b42886e33
+Z bfe5fd02ba4d5c951c96e8138fec5fad
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 9fa37d6a5130cd2b7aa288a0074e9b09075be667..6777f3edc1528b31ad2c4a6512a5f810846191c8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6b780655ccd68d068b6ee6621e56ac94c000916b7341651dc79725a0800cd1c0
+ebb346c5aa427b9e84a035278ee245d54810d9954efef12b898f2d7bc0ff630c

diff --git a/src/shell.c.in b/src/shell.c.in
index 790106cdb9bcb748e61452231621368605837a26..ccdf89a2f0ae1f8eb25101117b329265ce75d1a1 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -12759,7 +12759,7 @@ static char *find_home_dir(int clearFlag){
 }
 
 /*
-** On non-Windows platforms, look for the first file found out of:
+** On non-Windows platforms, look for:
 **
 ** - ${zEnvVar}/${zBaseName}
 ** - ${HOME}/${zSubdir}/${zBaseName}
@@ -12828,7 +12828,7 @@ static void process_sqliterc(
 
   if( sqliterc == NULL ){
     sqliterc = find_xdg_file("XDG_CONFIG_HOME",
-                             ".local/config",
+                             ".config",
                              "sqlite3/sqliterc");
   }
   if( sqliterc == NULL ){