amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-13 05:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Ignore --color flags when creating installers and when exporting

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1096 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-08-08 13:41:32 +00:00
parent 1c6d36b820
commit 8b01aa1823
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+8 -4
View File
@@ -106,7 +106,7 @@ int MSE::OnRun() {
InstallType type = settings.install_type; InstallType type = settings.install_type;
if (argc > 2) { if (argc > 2) {
String arg = argv[2]; String arg = argv[2];
if (starts_with(argv[2], _("--"))) { if (starts_with(argv[2], _("--")) && arg != _("--color")) {
parse_enum(String(argv[2]).substr(2), type); parse_enum(String(argv[2]).substr(2), type);
} }
} }
@@ -122,7 +122,9 @@ int MSE::OnRun() {
// create an installer // create an installer
Installer inst; Installer inst;
for (int i = 2 ; i < argc ; ++i) { for (int i = 2 ; i < argc ; ++i) {
inst.addPackage(argv[i]); if (!starts_with(argv[i],_("--"))) {
inst.addPackage(argv[i]);
}
} }
if (inst.prefered_filename.empty()) { if (inst.prefered_filename.empty()) {
throw Error(_("Specify packages to include in installer")); throw Error(_("Specify packages to include in installer"));
@@ -204,13 +206,15 @@ int MSE::OnRun() {
CLISetInterface cli_interface(set,quiet); CLISetInterface cli_interface(set,quiet);
return EXIT_SUCCESS; return EXIT_SUCCESS;
} else if (arg == _("--export")) { } else if (arg == _("--export")) {
if (argc <= 2) { if (argc <= 2 || argc <= 3 && starts_with(argv[2],_("--"))) {
handle_error(Error(_("No input file specified for --export"))); handle_error(Error(_("No input file specified for --export")));
return EXIT_FAILURE; return EXIT_FAILURE;
} }
SetP set = import_set(argv[2]); SetP set = import_set(argv[2]);
// path // path
String out = argc >= 3 ? argv[3] : settings.gameSettingsFor(*set->game).images_export_filename; String out = argc >= 3 && !starts_with(argv[3],_("--"))
? argv[3]
: settings.gameSettingsFor(*set->game).images_export_filename;
String path = _("."); String path = _(".");
size_t pos = out.find_last_of(_("/\\")); size_t pos = out.find_last_of(_("/\\"));
if (pos != String::npos) { if (pos != String::npos) {