From d93fde2853af5847aa4026ece405ea93d01b3fa1 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Tue, 25 Oct 2016 16:02:46 +0200
Subject: [PATCH] Fixed: Ryzom client patcher doesn't depend on any cfg file
 anymore

---
 .../client/client_patcher/CMakeLists.txt      |  5 +-
 .../tools/client/client_patcher/main.cpp      | 57 +++++++------------
 2 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/code/ryzom/tools/client/client_patcher/CMakeLists.txt b/code/ryzom/tools/client/client_patcher/CMakeLists.txt
index 9616f8153..051be7a60 100644
--- a/code/ryzom/tools/client/client_patcher/CMakeLists.txt
+++ b/code/ryzom/tools/client/client_patcher/CMakeLists.txt
@@ -1,7 +1,6 @@
 FILE(GLOB SRC main.cpp
 	${CMAKE_SOURCE_DIR}/ryzom/client/src/app_bundle_utils.cpp
 	${CMAKE_SOURCE_DIR}/ryzom/client/src/user_agent.cpp
-	${CMAKE_SOURCE_DIR}/ryzom/client/src/client_cfg.cpp
 	${CMAKE_SOURCE_DIR}/ryzom/client/src/login_patch.cpp
 	${CMAKE_SOURCE_DIR}/ryzom/client/src/login_xdelta.cpp
 	${CMAKE_SOURCE_DIR}/ryzom/client/src/stdpch.cpp
@@ -9,7 +8,7 @@ FILE(GLOB SRC main.cpp
 )
 
 # always enable custom patch server
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -DRZ_USE_CUSTOM_PATCH_SERVER)
+ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 ADD_EXECUTABLE(ryzom_client_patcher ${SRC})
 
@@ -32,7 +31,7 @@ IF(APPLE)
   TARGET_LINK_LIBRARIES(ryzom_client_patcher ${FOUNDATION_LIBRARY})
 ENDIF(APPLE)
 
-ADD_DEFINITIONS(${CURL_DEFINITIONS} -DRZ_NO_CLIENT -DNL_USE_SEVENZIP)
+ADD_DEFINITIONS(${CURL_DEFINITIONS})
 
 NL_DEFAULT_PROPS(ryzom_client_patcher "Ryzom, Tools: Ryzom Client Patcher")
 NL_ADD_RUNTIME_FLAGS(ryzom_client_patcher)
diff --git a/code/ryzom/tools/client/client_patcher/main.cpp b/code/ryzom/tools/client/client_patcher/main.cpp
index 08be87fbe..76fcc495b 100644
--- a/code/ryzom/tools/client/client_patcher/main.cpp
+++ b/code/ryzom/tools/client/client_patcher/main.cpp
@@ -16,6 +16,22 @@
 using namespace NLMISC;
 using namespace std;
 
+// simplified implementation to not depend on client_cfg.cpp
+CClientConfig::CClientConfig()
+{
+}
+
+void CClientConfig::serial(class NLMISC::IStream &/* f */) throw(NLMISC::EStream)
+{
+}
+
+bool CClientConfig::getDefaultConfigLocation(std::string&/* p_name */) const
+{
+	return false;
+}
+
+CClientConfig ClientCfg;
+
 // stuff which is defined as extern in other .cpp files
 void quitCrashReport()
 {
@@ -126,7 +142,7 @@ void printDownload(const std::string &str)
 	fflush(stdout);
 }
 
-// hardcoded english translations to not depends on external files
+// hardcoded english translations to not depend on external files
 struct CClientPatcherTranslations : public NLMISC::CI18N::ILoadProxy
 {
 	virtual void loadStringFile(const std::string &filename, ucstring &text)
@@ -174,6 +190,8 @@ struct CClientPatcherTranslations : public NLMISC::CI18N::ILoadProxy
 	}
 };
 
+// hardcoded URL to not depend on external files
+static const std::string PatchUrl = "http://dl.ryzom.com/patch_live";
 
 int main(int argc, char *argv[])
 {
@@ -182,7 +200,6 @@ int main(int argc, char *argv[])
 
 	Args.setVersion(getDisplayVersion());
 	Args.setDescription("Ryzom client");
-	Args.addArg("c", "config", "id", "Use this configuration to determine what directory to use by default");
 
 	if (!Args.parse(argc, argv)) return 1;
 
@@ -194,28 +211,6 @@ int main(int argc, char *argv[])
 	INelContext::getInstance().getInfoLog()->removeDisplayer("DEFAULT_SD");
 	INelContext::getInstance().getWarningLog()->removeDisplayer("DEFAULT_SD");
 
-	std::string config = "client.cfg";
-
-	// if client.cfg is not in current directory, use client.cfg from user directory
-	if (!CFile::isExists(config))
-		config = CPath::getApplicationDirectory("Ryzom") + config;
-
-	// if client.cfg is not in current directory, use client_default.cfg
-	if (!CFile::isExists(config))
-		config = "client_default.cfg";
-
-#ifdef RYZOM_ETC_PREFIX
-	// if client_default.cfg is not in current directory, use application default directory
-	if (!CFile::isExists(config))
-		config = CPath::standardizePath(RYZOM_ETC_PREFIX) + config;
-#endif
-
-	if (!CFile::isExists(config))
-	{
-		printError(config + " not found, aborting patch.");
-		return 1;
-	}
-
 	// check if console supports colors
 	std::string term = toLower(std::string(getenv("TERM") ? getenv("TERM"):""));
 	useEsc = (term.find("xterm") != string::npos || term.find("linux") != string::npos);
@@ -233,16 +228,6 @@ int main(int argc, char *argv[])
 	}
 #endif
 
-	// load client.cfg or client_default.cfg
-	ClientCfg.init(config);
-
-	// check if PatchUrl is defined
-	if (ClientCfg.PatchUrl.empty())
-	{
-		printError("PatchUrl not defined in " + config);
-		return 1;
-	}
-
 	// allocate translations proxy
 	CClientPatcherTranslations *trans = new CClientPatcherTranslations();
 
@@ -255,6 +240,8 @@ int main(int argc, char *argv[])
 	// now translations are read, we don't need it anymore
 	delete trans;
 
+	Args.displayVersion();
+	printf("\n");
 	printf("Checking %s files to patch...\n", convert(CI18N::get("TheSagaOfRyzom")).c_str());
 
 	// initialize patch manager and set the ryzom full path, before it's used
@@ -262,7 +249,7 @@ int main(int argc, char *argv[])
 
 	// use PatchUrl
 	vector<string> patchURLs;
-	pPM->init(patchURLs, ClientCfg.PatchUrl, ClientCfg.PatchVersion);
+	pPM->init(patchURLs, PatchUrl, "");
 	pPM->startCheckThread(true /* include background patchs */);
 
 	ucstring state;