Merge with develop

code/nel/src/misc/common.cpp

@@ -806,7 +806,7 @@ bool launchProgram(const std::string &programName, const std::string &arguments,
 
 #ifdef NL_OS_MAC
 	// special OS X case with bundles
-	if (toLower(programName).find(".app") != std::string::npos)
+	if (toLower(CFile::getExtension(programName)) == ".app")
 	{
 		// we need to open bundles with "open" command
 		std::string command = NLMISC::toString("open \"%s\"", programName.c_str());
@@ -914,7 +914,7 @@ bool launchProgramArray (const std::string &programName, const std::vector<std::
 
 #ifdef NL_OS_MAC
 	// special OS X case with bundles
-	if (toLower(programName).find(".app") != std::string::npos)
+	if (toLower(CFile::getExtension(programName)) == "app")
 	{
 		// we need to open bundles with "open" command
 		std::string command = NLMISC::toString("open \"%s\"", programName.c_str());

code/ryzom/client/macosx/upgd_nl.sh

@@ -0,0 +1,38 @@
+#!/bin/sh
+
+if [ -z "$ROOTPATH" ]
+then
+  echo "upgd_nl.sh can only be launched from updt_nl.sh"
+  exit 1
+fi
+
+# determine directory where all files reside
+CONTENTSPATH=$(dirname $ROOTPATH)
+MACOSPATH=$(dirname $RYZOM_CLIENT)
+SIGNPATH=$CONTENTSPATH/_CodeSignature
+
+# all files of original Bundle are in the same directory
+# we have to copy them to the right location
+
+# client_default.cfg and ryzom.icns are already in the right location
+
+# PkgInfo usually doesn't change so don't copy it
+
+# Info.plist contains updated version
+cp -p $ROOTPATH/Info.plist $CONTENTSPATH
+
+cp -p $ROOTPATH/CodeResources $SIGNPATH
+
+# executable flag for all executables
+chmod +x $ROOTPATH/Ryzom
+chmod +x $ROOTPATH/CrashReport
+chmod +x $ROOTPATH/RyzomClientPatcher
+chmod +x $ROOTPATH/RyzomConfiguration
+
+# copy all binaries in MacOS directory
+cp -p $ROOTPATH/Ryzom $MACOSPATH
+cp -p $ROOTPATH/CrashReport $MACOSPATH
+cp -p $ROOTPATH/RyzomClientPatcher $MACOSPATH
+cp -p $ROOTPATH/RyzomConfiguration $MACOSPATH
+
+exit 0

code/ryzom/client/src/client.cpp

@@ -279,20 +279,6 @@ int main(int argc, char **argv)
 
 	pump ();
 
-	// Delete the .bat file because it s not useful anymore
-	if (NLMISC::CFile::fileExists("updt_nl.bat"))
-		NLMISC::CFile::deleteFile("updt_nl.bat");
-	if (NLMISC::CFile::fileExists("bug_report.exe"))
-		NLMISC::CFile::deleteFile("bug_report.exe");
-	if (NLMISC::CFile::fileExists("bug_report_r.exe"))
-		NLMISC::CFile::deleteFile("bug_report_r.exe");
-	if (NLMISC::CFile::fileExists("bug_report_rd.exe"))
-		NLMISC::CFile::deleteFile("bug_report_rd.exe");
-	if (NLMISC::CFile::fileExists("bug_report_df.exe"))
-		NLMISC::CFile::deleteFile("bug_report_df.exe");
-	if (NLMISC::CFile::fileExists("bug_report_d.exe"))
-		NLMISC::CFile::deleteFile("bug_report_d.exe");
-
 	// Delete all the .ttf file in the /data directory
 	{
 		vector<string> files;
@@ -307,10 +293,6 @@ int main(int argc, char **argv)
 
 #else
 	// TODO for Linux : splashscreen
-
-	// Delete the .sh file because it s not useful anymore
-	if (NLMISC::CFile::fileExists("updt_nl.sh"))
-		NLMISC::CFile::deleteFile("updt_nl.sh");
 #endif
 
 	// initialize patch manager and set the ryzom full path, before it's used

code/ryzom/client/src/login_patch.cpp

@@ -171,7 +171,7 @@ CPatchManager::CPatchManager() : State("t_state"), DataScanState("t_data_scan_st
 	ForceRemovePatchCategories.push_back("main_exedll_linux32");
 	ForceRemovePatchCategories.push_back("main_exedll_linux64");
 	ForceRemovePatchCategories.push_back("main_exedll_osx");
-#elif defined(NL_OS_APPLE)
+#elif defined(NL_OS_MAC)
 	ForceRemovePatchCategories.push_back("main_exedll_win32");
 	ForceRemovePatchCategories.push_back("main_exedll_win64");
 	ForceRemovePatchCategories.push_back("main_exedll_linux32");
@@ -195,6 +195,12 @@ void CPatchManager::setClientRootPath(const std::string& clientRootPath)
 	ClientRootPath = CPath::standardizePath(clientRootPath);
 	ClientPatchPath = CPath::standardizePath(ClientRootPath + "unpack");
 
+	// Delete the .sh file because it's not useful anymore
+	std::string fullUpdateBatchFilename = ClientRootPath + UpdateBatchFilename;
+
+	if (NLMISC::CFile::fileExists(fullUpdateBatchFilename))
+		NLMISC::CFile::deleteFile(fullUpdateBatchFilename);
+
 	WritableClientDataPath = CPath::standardizePath(ClientRootPath + "data");
 
 #ifdef NL_OS_MAC

code/ryzom/client/unix/upgd_nl.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if [ -z "$ROOTPATH" ]
+then
+  echo "upgd_nl.sh can only be launched from updt_nl.sh"
+  exit 1
+fi
+
+# executable flag for all executables
+chmod +x $ROOTPATH/ryzom_client
+chmod +x $ROOTPATH/crash_report
+chmod +x $ROOTPATH/ryzom_client_patcher
+chmod +x $ROOTPATH/ryzom_configuration
+
+exit 0