mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-09 01:46:28 +02:00
Code Issues Projects Releases Wiki Activity

- proper detection that user does not have 7z installed in their path

Browse Source
This commit is contained in:
Mark Vejvoda
2011-04-09 22:20:10 +00:00
parent 51ae014124
commit 42a6737960
7 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/shared_lib/include/platform/common/platform_common.h
View File

@@ -39,6 +39,7 @@ using Shared::Util::Checksum;
namespace Shared { namespace PlatformCommon {
static const int IGNORE_CMD_RESULT_VALUE = -999999;
// =====================================================
// class PerformanceTimer
// =====================================================
@@ -191,7 +192,7 @@ inline string trim (const string & s, const string & t = SPACES) {
string getFullFileArchiveExtractCommand(string fileArchiveExtractCommand,
string fileArchiveExtractCommandParameters, string outputpath, string archivename);
bool executeShellCommand(string cmd);
bool executeShellCommand(string cmd,int expectedResult=IGNORE_CMD_RESULT_VALUE);
class ValueCheckerVault {

4
source/shared_lib/include/platform/posix/miniftpclient.h
View File

@@ -104,6 +104,7 @@ protected:
string fileArchiveExtension;
string fileArchiveExtractCommand;
string fileArchiveExtractCommandParameters;
int fileArchiveExtractCommandSuccessResult;
pair<FTP_Client_ResultType,string> getFileFromServer(FTP_Client_CallbackType downloadType,
pair<string,string> fileNameTitle,
@@ -120,7 +121,8 @@ public:
FTPClientCallbackInterface *pCBObject,
string fileArchiveExtension,
string fileArchiveExtractCommand,
string fileArchiveExtractCommandParameters);
string fileArchiveExtractCommandParameters,
int fileArchiveExtractCommandSuccessResult);
virtual void execute();
virtual void signalQuit();
virtual bool shutdownAndWait();