nold/nstool
1
0
Fork 0
mirror of https://github.com/jakcron/nstool synced 2024-11-22 21:49:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clarified help text.

Browse source
This commit is contained in:
jakcron 2021-11-09 16:30:11 +08:00
parent be59f92a2c
commit d1e1d5229b
2 changed files with 45 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
README.md
View file

@ -31,30 +31,31 @@ Usage: nstool [options... ] <file>
--showlayout Show layout metadata. --showlayout Show layout metadata.
-v, --verbose Verbose output. -v, --verbose Verbose output.
XCI (GameCard Image)
nstool [--listfs] [--update <dir> --logo <dir> --normal <dir> --secure <dir>] <.xci file>
--listfs Print file system in embedded partitions.
--update Extract "update" partition to directory.
--logo Extract "logo" partition to directory.
--normal Extract "normal" partition to directory.
--secure Extract "secure" partition to directory.
PFS0/HFS0 (PartitionFs), RomFs, NSP (Nintendo Submission Package) PFS0/HFS0 (PartitionFs), RomFs, NSP (Nintendo Submission Package)
nstool [--listfs] [--fsdir <dir>] <file> nstool [--listfs] [--fsdir [<virtual path>] <out path>] <file>
--listfs Print file system. --listfs Print file system.
--fsdir Extract file system to directory. -x, --fsdir Extract file system to directory.
XCI (GameCard Image)
nstool [--listfs] [--fsdir [<virtual path>] <out path>] [--update <dir> --logo <dir> --normal <dir> --secure <dir>] <.xci file>
--listfs Print file system.
-x, --fsdir Extract file system to directory.
--update Extract "update" partition to directory. (Alias for "-x /update <out path>")
--logo Extract "logo" partition to directory. (Alias for "-x /logo <out path>")
--normal Extract "normal" partition to directory. (Alias for "-x /normal <out path>")
--secure Extract "secure" partition to directory. (Alias for "-x /secure <out path>")
NCA (Nintendo Content Archive) NCA (Nintendo Content Archive)
nstool [--listfs] [--bodykey <key> --titlekey <key>] [--part0 <dir> ...] <.nca file> nstool [--listfs] [--bodykey <key> --titlekey <key>] [--fsdir [<virtual path>] <out path>] [--part0 <dir> ...] <.nca file>
--listfs Print file system in embedded partitions. --listfs Print file system.
-x, --fsdir Extract file system to directory.
--titlekey Specify title key extracted from ticket. --titlekey Specify title key extracted from ticket.
--bodykey Specify body encryption key.
--tik Specify ticket to source title key. --tik Specify ticket to source title key.
--cert Specify certificate chain to verify ticket. --cert Specify certificate chain to verify ticket.
--part0 Extract "partition 0" to directory. --part0 Extract "partition 0" to directory. (Alias for "-x /0 <out path>")
--part1 Extract "partition 1" to directory. --part1 Extract "partition 1" to directory. (Alias for "-x /1 <out path>")
--part2 Extract "partition 2" to directory. --part2 Extract "partition 2" to directory. (Alias for "-x /2 <out path>")
--part3 Extract "partition 3" to directory. --part3 Extract "partition 3" to directory. (Alias for "-x /3 <out path>")
NSO (Nintendo Shared Object), NRO (Nintendo Relocatable Object) NSO (Nintendo Shared Object), NRO (Nintendo Relocatable Object)
nstool [--listapi --listsym] [--insttype <inst. type>] <file> nstool [--listapi --listsym] [--insttype <inst. type>] <file>
@ -62,16 +63,16 @@ Usage: nstool [options... ] <file>
--listsym Print Code Symbols. --listsym Print Code Symbols.
--insttype Specify instruction type [64bit|32bit] (64bit is assumed). --insttype Specify instruction type [64bit|32bit] (64bit is assumed).
INI1 (Initial Program Bundle) INI (Initial Program Bundle)
nstool [--kipdir <dir>] <file> nstool [--kipdir <dir>] <file>
--kipdir Extract embedded Initial Programs to directory. --kipdir Extract embedded Inital Programs to directory.
ASET (Homebrew Asset Blob) ASET (Homebrew Asset Blob)
nstool [--listfs] [--icon <file> --nacp <file> --fsdir <dir>] <file> nstool [--listfs] [--icon <file> --nacp <file> --fsdir <dir>] <file>
--listfs Print filesystem in embedded RomFS partition. --listfs Print filesystem in embedded RomFS partition.
--icon Extract icon partition to file. --icon Extract icon partition to file.
--nacp Extract NACP partition to file. --nacp Extract NACP partition to file.
--fsdir Extract RomFS partition to directory. -x, --fsdir Extract RomFS partition to directory.
``` ```
# External Keys # External Keys

41
src/Settings.cpp
View file

@ -404,6 +404,11 @@ public:
throw tc::ArgumentOutOfRangeException(fmt::format("Option \"{:s}\" requires a parameter.", option)); throw tc::ArgumentOutOfRangeException(fmt::format("Option \"{:s}\" requires a parameter.", option));
} }
std::string custom_path_str;
tc::io::PathUtil::pathToUnixUTF8(mCustomPath, custom_path_str);
fmt::print("[WARNING] \"{:s} {:s}\" is deprecated. Consider using \"-x {:s} {:s}\" instead.\n", option, params[0], custom_path_str, params[0]);
mJobs.push_back({mCustomPath, tc::io::Path(params[0])}); mJobs.push_back({mCustomPath, tc::io::Path(params[0])});
} }
private: private:
@ -700,28 +705,30 @@ void nstool::SettingsInitializer::usage_text() const
fmt::print(" --showkeys Show keys generated.\n"); fmt::print(" --showkeys Show keys generated.\n");
fmt::print(" --showlayout Show layout metadata.\n"); fmt::print(" --showlayout Show layout metadata.\n");
fmt::print(" -v, --verbose Verbose output.\n"); fmt::print(" -v, --verbose Verbose output.\n");
fmt::print("\n XCI (GameCard Image)\n");
fmt::print(" {:s} [--listfs] [--update <dir> --logo <dir> --normal <dir> --secure <dir>] <.xci file>\n", BIN_NAME);
fmt::print(" --listfs Print file system in embedded partitions.\n");
fmt::print(" --update Extract \"update\" partition to directory.\n");
fmt::print(" --logo Extract \"logo\" partition to directory.\n");
fmt::print(" --normal Extract \"normal\" partition to directory.\n");
fmt::print(" --secure Extract \"secure\" partition to directory.\n");
fmt::print("\n PFS0/HFS0 (PartitionFs), RomFs, NSP (Nintendo Submission Package)\n"); fmt::print("\n PFS0/HFS0 (PartitionFs), RomFs, NSP (Nintendo Submission Package)\n");
fmt::print(" {:s} [--listfs] [--fsdir <dir>] <file>\n", BIN_NAME); fmt::print(" {:s} [--listfs] [--fsdir [<virtual path>] <out path>] <file>\n", BIN_NAME);
fmt::print(" --listfs Print file system.\n"); fmt::print(" --listfs Print file system.\n");
fmt::print(" --fsdir Extract file system to directory.\n"); fmt::print(" -x, --fsdir Extract file system to directory.\n");
fmt::print("\n XCI (GameCard Image)\n");
fmt::print(" {:s} [--listfs] [--fsdir [<virtual path>] <out path>] [--update <dir> --logo <dir> --normal <dir> --secure <dir>] <.xci file>\n", BIN_NAME);
fmt::print(" --listfs Print file system.\n");
fmt::print(" -x, --fsdir Extract file system to directory.\n");
fmt::print(" --update Extract \"update\" partition to directory. (Alias for \"-x /update <out path>\")\n");
fmt::print(" --logo Extract \"logo\" partition to directory. (Alias for \"-x /logo <out path>\")\n");
fmt::print(" --normal Extract \"normal\" partition to directory. (Alias for \"-x /normal <out path>\")\n");
fmt::print(" --secure Extract \"secure\" partition to directory. (Alias for \"-x /secure <out path>\")\n");
fmt::print("\n NCA (Nintendo Content Archive)\n"); fmt::print("\n NCA (Nintendo Content Archive)\n");
fmt::print(" {:s} [--listfs] [--bodykey <key> --titlekey <key>] [--part0 <dir> ...] <.nca file>\n", BIN_NAME); fmt::print(" {:s} [--listfs] [--bodykey <key> --titlekey <key>] [--fsdir [<virtual path>] <out path>] [--part0 <dir> ...] <.nca file>\n", BIN_NAME);
fmt::print(" --listfs Print file system in embedded partitions.\n"); fmt::print(" --listfs Print file system.\n");
fmt::print(" -x, --fsdir Extract file system to directory.\n");
fmt::print(" --titlekey Specify title key extracted from ticket.\n"); fmt::print(" --titlekey Specify title key extracted from ticket.\n");
fmt::print(" --bodykey Specify body encryption key.\n"); //fmt::print(" --bodykey Specify body encryption key.\n");
fmt::print(" --tik Specify ticket to source title key.\n"); fmt::print(" --tik Specify ticket to source title key.\n");
fmt::print(" --cert Specify certificate chain to verify ticket.\n"); fmt::print(" --cert Specify certificate chain to verify ticket.\n");
fmt::print(" --part0 Extract \"partition 0\" to directory.\n"); fmt::print(" --part0 Extract \"partition 0\" to directory. (Alias for \"-x /0 <out path>\")\n");
fmt::print(" --part1 Extract \"partition 1\" to directory.\n"); fmt::print(" --part1 Extract \"partition 1\" to directory. (Alias for \"-x /1 <out path>\")\n");
fmt::print(" --part2 Extract \"partition 2\" to directory.\n"); fmt::print(" --part2 Extract \"partition 2\" to directory. (Alias for \"-x /2 <out path>\")\n");
fmt::print(" --part3 Extract \"partition 3\" to directory.\n"); fmt::print(" --part3 Extract \"partition 3\" to directory. (Alias for \"-x /3 <out path>\")\n");
fmt::print("\n NSO (Nintendo Shared Object), NRO (Nintendo Relocatable Object)\n"); fmt::print("\n NSO (Nintendo Shared Object), NRO (Nintendo Relocatable Object)\n");
fmt::print(" {:s} [--listapi --listsym] [--insttype <inst. type>] <file>\n", BIN_NAME); fmt::print(" {:s} [--listapi --listsym] [--insttype <inst. type>] <file>\n", BIN_NAME);
fmt::print(" --listapi Print SDK API List.\n"); fmt::print(" --listapi Print SDK API List.\n");
@ -735,7 +742,7 @@ void nstool::SettingsInitializer::usage_text() const
fmt::print(" --listfs Print filesystem in embedded RomFS partition.\n"); fmt::print(" --listfs Print filesystem in embedded RomFS partition.\n");
fmt::print(" --icon Extract icon partition to file.\n"); fmt::print(" --icon Extract icon partition to file.\n");
fmt::print(" --nacp Extract NACP partition to file.\n"); fmt::print(" --nacp Extract NACP partition to file.\n");
fmt::print(" --fsdir Extract RomFS partition to directory.\n"); fmt::print(" -x, --fsdir Extract RomFS partition to directory.\n");
} }
void nstool::SettingsInitializer::dump_keys() const void nstool::SettingsInitializer::dump_keys() const