diff --git a/GNUmakefile b/GNUmakefile index dcc946a1..1276bee9 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -864,7 +864,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" diff --git a/bleh.tar.xz b/bleh.tar.xz new file mode 100644 index 00000000..070bbbfd Binary files /dev/null and b/bleh.tar.xz differ diff --git a/sqlite3 b/sqlite3 deleted file mode 100755 index 26a6cdcf..00000000 Binary files a/sqlite3 and /dev/null differ diff --git a/src/main.c b/src/main.c index da1cedb4..486aeb26 100644 --- a/src/main.c +++ b/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(" -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(" -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(" -n, --count count Number of instances to run.\n"); - tf_printf(" -a, --args args Arguments of the format key=value,foo=bar,verbose=true.\n"); - tf_printf(" -o, --one-proc Run everything in one process (unsafely!).\n"); - tf_printf(" -z, --zip path Zip archive from which to load files.\n"); - tf_printf(" -v, --verbose Log raw messages.\n"); - tf_printf(" -h, --help Show this usage information.\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(" -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(" -d, --db-path path SQLite database path (default: %s).\n", k_db_path_default); + tf_printf(" -k, --ssb-network-key key SSB network key to use.\n"); + tf_printf(" -n, --count count Number of instances to run.\n"); + tf_printf(" -a, --args args Arguments of the format key=value,foo=bar,verbose=true.\n"); + tf_printf(" -o, --one-proc Run everything in one process (unsafely!).\n"); + tf_printf(" -z, --zip path Zip archive from which to load files.\n"); + tf_printf(" -v, --verbose Log raw messages.\n"); + tf_printf(" -h, --help Show this usage information.\n"); return EXIT_FAILURE; }