Merge branch 'main' into user_settings

GNUmakefile

@@ -867,7 +867,9 @@ dist: release-apk iosrelease-ipa
 		--exclude=deps/sqlite/shell.c \
 		--exclude=deps/zlib/contrib/vstudio \
 		--exclude=deps/zlib/doc \
-		-caf dist/tildefriends-$(VERSION_NUMBER).tar.xz out/tildefriends-$(VERSION_NUMBER)
+		-caf dist/tildefriends-$(VERSION_NUMBER).tar.xz \
+		-C out/ \
+		tildefriends-$(VERSION_NUMBER)
 	@echo "[cp] TildeFriends-x86-$(VERSION_NUMBER).apk"
 	@cp out/TildeFriends-x86-release.zopfli.apk dist/TildeFriends-x86-$(VERSION_NUMBER).apk
 	@echo "[cp] TildeFriends-arm-$(VERSION_NUMBER).apk"

src/main.c

@@ -485,17 +485,18 @@ static int _tf_command_run(const char* file, int argc, char* argv[])
 	{
 		tf_printf("\n%s run [options]\n\n", file);
 		tf_printf("options\n");
-		tf_printf("  -s, --script script       Script to run (default: core/core.js).\n");
+		tf_printf("  -s, --script script        Script to run (default: core/core.js).\n");
-		tf_printf("  -b, --ssb-port port       Port on which to run SSB (default: 8008, 0 disables).\n");
+		tf_printf("  -b, --ssb-port port        Port on which to run SSB (default: 8008, 0 disables).\n");
-		tf_printf("  -p, --http-port port      Port on which to run Tilde Friends web server (default: 12345).\n");
+		tf_printf("  -p, --http-port port       Port on which to run Tilde Friends web server (default: 12345).\n");
-		tf_printf("  -q, --https-port port     Port on which to run secure Tilde Friends web server (default: 12346).\n");
+		tf_printf("  -q, --https-port port      Port on which to run secure Tilde Friends web server (default: 12346).\n");
-		tf_printf("  -d, --db-path path        SQLite database path (default: %s).\n", k_db_path_default);
+		tf_printf("  -d, --db-path path         SQLite database path (default: %s).\n", k_db_path_default);
-		tf_printf("  -n, --count count         Number of instances to run.\n");
+		tf_printf("  -k, --ssb-network-key key  SSB network key to use.\n");
-		tf_printf("  -a, --args args           Arguments of the format key=value,foo=bar,verbose=true.\n");
+		tf_printf("  -n, --count count          Number of instances to run.\n");
-		tf_printf("  -o, --one-proc            Run everything in one process (unsafely!).\n");
+		tf_printf("  -a, --args args            Arguments of the format key=value,foo=bar,verbose=true.\n");
-		tf_printf("  -z, --zip path            Zip archive from which to load files.\n");
+		tf_printf("  -o, --one-proc             Run everything in one process (unsafely!).\n");
-		tf_printf("  -v, --verbose             Log raw messages.\n");
+		tf_printf("  -z, --zip path             Zip archive from which to load files.\n");
-		tf_printf("  -h, --help                Show this usage information.\n");
+		tf_printf("  -v, --verbose              Log raw messages.\n");
+		tf_printf("  -h, --help                 Show this usage information.\n");
 		return EXIT_FAILURE;
 	}