[Bug 19730] Added further tweaks and a stricter test

livecodepanos · livecodepanos · commit fda7c31497d9 · 2017-05-29T13:53:20.000+01:00
diff --git a/engine/src/dskmac.cpp b/engine/src/dskmac.cpp
@@ -917,11 +917,23 @@ static bool MCS_apply_redirect(MCStringRef p_path, bool p_is_file, MCStringRef&
     MCAutoStringRef t_new_path;
     MCRange t_cmd_range, t_path_range;
     t_cmd_range = MCRangeMake(0, t_engine_path_length - 6);
-    t_path_range = MCRangeMake(t_engine_path_length + 1, UINDEX_MAX);
-    
-    // AL-2014-09-19: Range argument to MCStringFormat is a pointer to an MCRange.
-    /* UNCHECKED */ MCStringFormat(&t_new_path, "%*@/Resources/_MacOS/%*@", &t_cmd_range, MCcmd, &t_path_range, p_path);
-    
+	
+	uindex_t t_path_end = MCStringGetLength(p_path);
+	if (MCStringGetCodepointAtIndex(p_path, t_path_end) == '/')
+		t_path_end--;
+	
+	t_path_range = MCRangeMakeMinMax(t_engine_path_length + 1, t_path_end);
+	
+	if (t_engine_path_length == t_path_end)
+	{
+		MCStringFormat(&t_new_path, "%*@/Resources/_MacOS", &t_cmd_range, MCcmd);
+	}
+	else
+	{
+		// AL-2014-09-19: Range argument to MCStringFormat is a pointer to an MCRange.
+		MCStringFormat(&t_new_path, "%*@/Resources/_MacOS/%*@", &t_cmd_range, MCcmd, &t_path_range, p_path);
+	}
+	
     if (p_is_file && !MCS_file_exists_at_path(*t_new_path))
         return false;
 
@@ -3513,16 +3525,8 @@ struct MCMacDesktop: public MCSystemInterface, public MCMacSystemService
             if (MCNameIsEqualTo(p_type, MCN_resources, kMCCompareCaseless))
             {
                 MCAutoStringRef t_resources_folder;
-                if (!MCS_apply_redirect(*t_engine_folder, false, &t_resources_folder))
+                if (!MCS_apply_redirect(*t_engine_folder, false, r_folder))
                     return False;
-                
-                if (MCStringEndsWith(*t_resources_folder, MCSTR("/"), kMCCompareExact))
-                {
-                    MCStringCopySubstring(*t_resources_folder, MCRangeMake(0, MCStringGetLength(*t_resources_folder) - 1), r_folder);
-                }
-                else
-                    r_folder = MCValueRetain(*t_resources_folder);
-                
             }
             else
                 r_folder = MCValueRetain(*t_engine_folder);
diff --git a/tests/lcs/core/files/files.livecodescript b/tests/lcs/core/files/files.livecodescript
@@ -127,8 +127,7 @@ on TestSpecialFolderPath
    put specialFolderPath("resources") into tResources
    if the platform is "macos" and the environment is "standalone" then
       // Standalone on Mac have their non-executable resource in a specific folder
-      set the itemDelimiter to slash
-      TestAssert "Resources folder on standalone Mac app in is  Resources/_MacOS", item -2 to -1 of tResources is "Resources/_MacOS"
+      TestAssert "Resources folder on standalone Mac app in is  Resources/_MacOS", tResources ends with "Resources/_MacOS"
    else if the environment is "mobile" then
       testAssert "Resources and Engine specialfolderPaths are the same on mobile", tResources is tEngine
    else
