Skip to content

Commit f0b1dba

Browse files
committed
Fix datapack not exporting properly on windows
1 parent f25fe18 commit f0b1dba

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

scripts/datapack_export/datapack_export.gml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ function datapack_export() {
5151
}
5252

5353
// Create folder structure
54-
tempdir = data_directory + "tempdatapack" + condstr(os_type = os_windows, "\\", "/")
54+
tempdir = game_save_id + "tempdatapack" + condstr(os_type = os_windows, "\\", "/")
5555
if (directory_exists_lib(tempdir)) {
5656
directory_delete_lib(tempdir)
5757
}
@@ -186,11 +186,11 @@ function datapack_export() {
186186

187187
// Execute shell command to create ZIP, or to move temp folder to location
188188
if (o.dat_usezip) {
189-
if (os_type = os_macosx) execute_program("ditto", "-c -k \"" + data_directory + "tempdatapack" + "\" \"" + fn + "\"", true);
190-
else execute_program(get_7z_exc_name(), "a -tzip \"" + fn + "\" \"" + data_directory + "tempdatapack" + condstr(os_type = os_windows, "\\", "/") + "*\"", true)
189+
if (os_type = os_macosx) execute_program("ditto", "-c -k \"" + game_save_id + "tempdatapack" + "\" \"" + fn + "\"", true);
190+
else execute_program(get_7z_exc_name(), "a -tzip \"" + fn + "\" \"" + game_save_id + "tempdatapack" + condstr(os_type = os_windows, "\\", "/") + "*\"", true)
191191
} else {
192-
if (os_type = os_windows) execute_program("cmd", "\"" + data_directory + "move.bat\" \"" + fn + "\\\"", true)
193-
else execute_program("cp", "-r \"" + data_directory + "tempdatapack\" \"" + fn + "/\"", true);
192+
if (os_type = os_windows) execute_program("cmd", "\"" + game_save_id + "move.bat\" \"" + fn + "\\\"", true)
193+
else execute_program("cp", "-r \"" + game_save_id + "tempdatapack\" \"" + fn + "/\"", true);
194194
}
195195

196196
directory_delete_lib(tempdir)

0 commit comments

Comments
 (0)