Pi-Hole/FTL
1
0
Fork 0
mirror of https://github.com/pi-hole/FTL.git synced 2025-12-25 07:56:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update SQLite CLI usage instructions due to a subtle change in 3.50.0

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2025-05-30 17:17:11 +02:00
parent 55cdcce507
commit 96d0eed119
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/args.c
View File

@@ -1022,7 +1022,7 @@ void parse_args(int argc, char *argv[])
printf("%sEmbedded SQLite3 shell:%s\n", yellow, normal);
printf("\t%ssql%s, %ssqlite3%s FTL's SQLite3 shell\n", green, normal, green, normal);
printf(" Usage: %s sqlite3 %s[OPTIONS] [FILENAME] [SQL]%s\n\n", green, cyan, normal);
printf(" Usage: %s sqlite3 %s[OPTIONS] [FILENAME [SQL...]]%s\n\n", green, cyan, normal);
printf(" Options:\n\n");
printf(" - %s[OPTIONS]%s is an optional set of options. All available\n", cyan, normal);
printf(" options can be found in %s%s sqlite3 --help%s.\n", green, argv[0], normal);
@@ -1031,7 +1031,7 @@ void parse_args(int argc, char *argv[])
printf(" A new database is created if the file does not previously\n");
printf(" exist. If this argument is omitted, SQLite3 will use a\n");
printf(" transient in-memory database instead.\n");
printf(" - %s[SQL]%s is an optional SQL statement to be executed. If\n", cyan, normal);
printf(" - %s[SQL...]%s is an optional SQL statement to be executed. If\n", cyan, normal);
printf(" omitted, an interactive shell is started instead.\n\n");
printf(" There are two special %s%s sqlite3%s mode switches:\n", green, argv[0], normal);
printf(" %s-h%s %shuman-readable%s mode:\n", purple, normal, bold, normal);
@@ -1043,7 +1043,7 @@ void parse_args(int argc, char *argv[])
printf(" In this mode, batch mode is enforced and any possibly\n");
printf(" existing .sqliterc file is ignored. %s-ni%s is a shortcut\n", purple, normal);
printf(" for %s%s sqlite3 %s-batch -init /dev/null%s\n\n", green, argv[0], purple, normal);
printf(" Usage: %s%s sqlite3 %s-ni %s[OPTIONS] [FILENAME] [SQL]%s\n\n", green, argv[0], purple, cyan, normal);
printf(" Usage: %s%s sqlite3 %s-ni %s[OPTIONS] [FILENAME [SQL...]]%s\n\n", green, argv[0], purple, cyan, normal);
printf("%ssqlite3_rsync%s tool:\n", yellow, normal);
printf("\t%ssqlite3_rsync%s Synchronize SQLite3 databases\n", green, normal);

2
test/test_suite.bats
View File

@@ -1381,7 +1381,7 @@
@test "Embedded SQLite3 shell available and functional" {
run bash -c './pihole-FTL sqlite3 -help'
printf "%s\n" "${lines[@]}"
[[ ${lines[0]} == "Usage: sqlite3 [OPTIONS] [FILENAME [SQL]]" ]]
[[ ${lines[0]} == "Usage: sqlite3 [OPTIONS] [FILENAME [SQL...]]" ]]
}
@test "Embedded SQLite3 shell is called for .db file" {