Fix macos still not copying bundle over

Author: OctoFlareDev

objects/obj_controller/Create_0.gml

@@ -8,7 +8,7 @@ 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) {

scripts/control_create/control_create.gml

@@ -631,6 +631,9 @@ function control_create() {
 
 	// Settings
 	if (!check_args("--prefreset")) load_settings()
+	var vers_tmp = vers
+	var vers_date_tmp = vers_date
+	if (vers_date_tmp != version_date) copy_bundled_files()
 	if (os_type = os_macosx) macos_enable_system_settings_menu()
 	tonextsave = autosave ? autosavemins : 0; // Defining autosavemins here to avoid the autosave when the first song is loaded after open the game.
 	menu_macos_init()
@@ -706,14 +709,13 @@ function control_create() {
 	update_download = -1
 	downloaded_size = 0
 	total_size = -1
-	if (file_exists_lib(settings_file) && vers != version) {
+	if (file_exists_lib(settings_file) && vers_tmp != version) {
 		if (theme = 2) fdark = 1
 		theme = 3 // Sets to the Fluent theme when updated
 	    window = w_update
 	    update_success = 1
 		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")
 

scripts/copy_bundled_files/copy_bundled_files.gml

@@ -4,7 +4,7 @@ function copy_bundled_files(){
 		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)
+		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)

scripts/draw_window_greeting/draw_window_greeting.gml

@@ -50,10 +50,18 @@ function draw_window_greeting() {
 		if (os_type = os_windows || os_type = os_linux) {
 			if (language != 1) draw_text_center(x1 + 132, y1 + 248 + dev_label_offset, "Update checking disabled.")
 			else draw_text_center(x1 + 132, y1 + 248 + dev_label_offset, "检查更新不可用")
-		} else if (os_type = os_macosx) {
+		} else {
 			if (language != 1) draw_text_center(x1 + 132, y1 + 248 + dev_label_offset, "Updates managed by TestFlight app.")
 			else draw_text_center(x1 + 132, y1 + 248 + dev_label_offset, "由 TestFlight 应用管理更新")
 		}
+	} else if (os_type = os_macosx) {
+		if (is_prerelease) {
+			if (language != 1) draw_text_center(x1 + 132, y1 + 248 + dev_label_offset, "Updates managed by TestFlight app.")
+			else draw_text_center(x1 + 132, y1 + 248 + dev_label_offset, "由 TestFlight 应用管理更新")
+		} else {
+			if (language != 1) draw_text_center(x1 + 132, y1 + 248 + dev_label_offset, "App Store Version")
+			else draw_text_center(x1 + 132, y1 + 248 + dev_label_offset, "App Store 版本")
+		}
 	} else if (check_update) {
 		if (update_success) {
 	        draw_set_color(c_lime)