mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-19 22:51:24 +02:00
Code Issues Projects Releases Wiki Activity

- removed hard coded reference to 7z, uses all ini file options

Browse Source
This commit is contained in:
Mark Vejvoda
2011-04-10 20:25:36 +00:00
parent 842f1dac69
commit 3e3b774dd5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/shared_lib/sources/platform/posix/miniftpclient.cpp
View File

@@ -993,7 +993,7 @@ void FTPClientThread::getFileFromServer(pair<string,string> fileName) {
bool findArchive = true; bool findArchive = true;
string ext = extractExtension(fileName.first); string ext = extractExtension(fileName.first);
if(ext == "7z") { if(("." + ext) == this->fileArchiveExtension) {
findArchive = executeShellCommand(this->fileArchiveExtractCommand,this->fileArchiveExtractCommandSuccessResult); findArchive = executeShellCommand(this->fileArchiveExtractCommand,this->fileArchiveExtractCommandSuccessResult);
} }
if(findArchive == true) { if(findArchive == true) {
@@ -1038,7 +1038,7 @@ pair<FTP_Client_ResultType,string> FTPClientThread::getFileInternalFromServer(p
// Extract the archive // Extract the archive
if(result.first == ftp_crt_SUCCESS) { if(result.first == ftp_crt_SUCCESS) {
string ext = extractExtension(destFileSaveAs); string ext = extractExtension(destFileSaveAs);
if(ext == "7z") { if(("." + ext) == fileArchiveExtension) {
string destRootArchiveFolder = extractDirectoryPathFromFile(destFileSaveAs); string destRootArchiveFolder = extractDirectoryPathFromFile(destFileSaveAs);
string extractCmd = getFullFileArchiveExtractCommand(this->fileArchiveExtractCommand, string extractCmd = getFullFileArchiveExtractCommand(this->fileArchiveExtractCommand,
this->fileArchiveExtractCommandParameters, destRootArchiveFolder, this->fileArchiveExtractCommandParameters, destRootArchiveFolder,