fix bundle copying failed...

Author: OctoFlareDev

objects/obj_controller/Create_0.gml

@@ -8,13 +8,13 @@ if (os_type = os_windows) {
   if (!directory_exists(songs_directory)) execute_program("Xcopy", @'/E /I "' + filename_dir(bundled_songs_directory) + @'" "' + filename_dir(songs_directory) + @'"', true)
   if (!directory_exists(pattern_directory)) execute_program("Xcopy", @'/E /I "' + filename_dir(bundled_pattern_directory) + @'" "' + filename_dir(pattern_directory) + @'"', true)
 } if (os_type = os_macosx) {
-  if (!directory_exists(data_directory)) execute_program("cp", @'-fR "' + filename_dir(bundled_data_directory) + @'" "' + filename_dir(data_directory) + @'"', true)
+  if (!directory_exists(data_directory)) execute_program("cp", @'-fR "' + filename_dir(bundled_data_directory) + @'." "' + filename_dir(data_directory) + @'"', true)
   //if (!directory_exists(songs_directory)) directory_create(songs_directory)
   //if (!directory_exists(pattern_directory)) directory_create(pattern_directory)
 } if (os_type = os_linux) {
-  if (!directory_exists(data_directory)) execute_program("cp", @'-fR "' + filename_dir(bundled_data_directory) + @'" "' + filename_dir(data_directory) + @'"', true)
-  if (!directory_exists(songs_directory)) execute_program("cp", @'-fR "' + filename_dir(bundled_songs_directory) + @'" "' + filename_dir(songs_directory) + @'"', true)
-  if (!directory_exists(pattern_directory)) execute_program("cp", @'-fR "' + filename_dir(bundled_pattern_directory) + @'" "' + filename_dir(pattern_directory) + @'"', true)
+  if (!directory_exists(data_directory)) execute_program("cp", @'-fR "' + filename_dir(bundled_data_directory) + @'." "' + filename_dir(data_directory) + @'"', true)
+  if (!directory_exists(songs_directory)) execute_program("cp", @'-fR "' + filename_dir(bundled_songs_directory) + @'." "' + filename_dir(songs_directory) + @'"', true)
+  if (!directory_exists(pattern_directory)) execute_program("cp", @'-fR "' + filename_dir(bundled_pattern_directory) + @'." "' + filename_dir(pattern_directory) + @'"', true)
 } if (os_type = os_ios) {
   if (!directory_exists(data_directory)) directory_copy(bundled_data_directory, data_directory);
   if (!directory_exists(songs_directory)) directory_copy(bundled_songs_directory, songs_directory);

scripts/control_create/control_create.gml

@@ -705,8 +705,6 @@ function control_create() {
 	update_download = -1
 	downloaded_size = 0
 	total_size = -1
-	changelogstr = load_text(bundled_data_directory + "changelog.txt")
-	creditsstr = load_text(bundled_data_directory + "credits.txt")
 	if (file_exists_lib(settings_file) && vers != version) {
 		if (theme = 2) fdark = 1
 		theme = 3 // Sets to the Fluent theme when updated
@@ -715,6 +713,8 @@ function control_create() {
 		donate_banner = 1 // Enable donate banner after each update
 	}
 	if (file_exists_lib(settings_file) && vers_date != version_date) copy_bundled_files()
+	changelogstr = load_text(bundled_data_directory + "changelog.txt")
+	creditsstr = load_text(bundled_data_directory + "credits.txt")
 
 	if (os_type = os_ios) recent_song[0] = bundled_songs_directory + "the_ground's_colour_is_yellow.nbs"
 

scripts/copy_bundled_files/copy_bundled_files.gml

@@ -1,8 +1,10 @@
 function copy_bundled_files(){
-	if (os_type != os_windows) {
-		execute_program("cp", @'-fR "' + filename_dir(bundled_data_directory) + @'" "' + filename_dir(data_directory) + @'"', true)
-		execute_program("cp", @'-fR "' + filename_dir(bundled_songs_directory) + @'" "' + filename_dir(songs_directory) + @'"', true)
-		execute_program("cp", @'-fR "' + filename_dir(bundled_pattern_directory) + @'" "' + filename_dir(pattern_directory) + @'"', true)
+	if (os_type = os_linux) {
+		execute_program("cp", @'-fR "' + filename_dir(bundled_data_directory) + @'." "' + filename_dir(data_directory) + @'"', true)
+		execute_program("cp", @'-fR "' + filename_dir(bundled_songs_directory) + @'." "' + filename_dir(songs_directory) + @'"', true)
+		execute_program("cp", @'-fR "' + filename_dir(bundled_pattern_directory) + @'." "' + filename_dir(pattern_directory) + @'"', true)
+	} else if (os_type = os_macosx) {
+		execute_program("cp", @'-fR "' + filename_dir(bundled_data_directory) + @'." "' + filename_dir(data_directory) + @'"', true)
 	} else {
 		execute_program("Xcopy", @'/E /I /Y "' + filename_dir(bundled_data_directory) + @'" "' + filename_dir(data_directory) + @'"', true)
 		execute_program("Xcopy", @'/E /I /Y "' + filename_dir(bundled_songs_directory) + @'" "' + filename_dir(songs_directory) + @'"', true)