Fix zipped output

This commit is contained in:
Matt Nadareski
2016-04-06 17:09:51 -07:00
parent 9769a91608
commit 3523feb20b

View File

@@ -472,8 +472,8 @@ Make a selection:
/// <param name="old">True if the output file should be in RomVault format (default false)</param> /// <param name="old">True if the output file should be in RomVault format (default false)</param>
private static void InitGenerateAll(string outdir, bool norename, bool old) private static void InitGenerateAll(string outdir, bool norename, bool old)
{ {
string actualdir = outdir + "/"; string actualdir = (outdir == "" ? Environment.CurrentDirectory + "/" : outdir + "/");
outdir = outdir + "/temp/"; outdir = actualdir + "/temp/";
// Generate system-merged // Generate system-merged
string query = @"SELECT DISTINCT systems.id string query = @"SELECT DISTINCT systems.id
@@ -568,7 +568,7 @@ Make a selection:
string internalFolder = (filename.Contains("ALL (merged") ? "" : string internalFolder = (filename.Contains("ALL (merged") ? "" :
filename.Contains("merged") ? "merged-system/" : filename.Contains("merged") ? "merged-system/" :
filename.Contains("ALL") ? "merged-source/" : "custom/"); filename.Contains("ALL") ? "merged-source/" : "custom/");
zip.CreateEntryFromFile(filename, internalFolder + filename); zip.CreateEntryFromFile(filename, internalFolder + Path.GetFileName(filename));
} }
} }
zip.Dispose(); zip.Dispose();