| Line 1052... |
Line 1052... |
| 1052 |
}
|
1052 |
}
|
| 1053 |
|
1053 |
|
| 1054 |
CCatFile fromcat;
|
1054 |
CCatFile fromcat;
|
| 1055 |
err = fromcat.Open ( pCheckFile->GetFilePointer().GetToken("::", 1, 1), "", CATREAD_CATDECRYPT, false );
|
1055 |
err = fromcat.Open ( pCheckFile->GetFilePointer().GetToken("::", 1, 1), "", CATREAD_CATDECRYPT, false );
|
| 1056 |
if ( err == CATERR_NONE ) {
|
1056 |
if ( err == CATERR_NONE ) {
|
| 1057 |
fromcat.RemoveFile(tofile);
|
1057 |
fromcat.removeFile(tofile.ToString());
|
| 1058 |
CLog::logf(CLog::Log_Install, 2, "Removing file from existing mod, %s::%s", pCheckFile->GetFilePointer().GetToken("::", 1, 1).c_str(), tofile.c_str());
|
1058 |
CLog::logf(CLog::Log_Install, 2, "Removing file from existing mod, %s::%s", pCheckFile->GetFilePointer().GetToken("::", 1, 1).c_str(), tofile.c_str());
|
| 1059 |
}
|
1059 |
}
|
| 1060 |
|
1060 |
|
| 1061 |
CLog::logf(CLog::Log_Install, 1, "Adjusting existing file name %s => %s", pCheckFile->GetFilePointer().c_str(), fit->GetFilePointer().c_str());
|
1061 |
CLog::logf(CLog::Log_Install, 1, "Adjusting existing file name %s => %s", pCheckFile->GetFilePointer().c_str(), fit->GetFilePointer().c_str());
|
| 1062 |
pCheckFile->SetFilename ( fit->GetFilePointer() );
|
1062 |
pCheckFile->SetFilename ( fit->GetFilePointer() );
|
| Line 1105... |
Line 1105... |
| 1105 |
if ( errorStr )
|
1105 |
if ( errorStr )
|
| 1106 |
errorStr->PushBack(CyString(sTo), ERRORLOG(SPKINSTALL_CREATEDIRECTORY));
|
1106 |
errorStr->PushBack(CyString(sTo), ERRORLOG(SPKINSTALL_CREATEDIRECTORY));
|
| 1107 |
}
|
1107 |
}
|
| 1108 |
}
|
1108 |
}
|
| 1109 |
else {
|
1109 |
else {
|
| 1110 |
CLog::logf(CLog::Log_Install, 2, "Adjusting file extension for file in mod, %s => %s", pFile->GetFilePointer().c_str(), CCatFile::PckChangeExtension(pFile->GetFilePointer()).c_str());
|
1110 |
CLog::logf(CLog::Log_Install, 2, "Adjusting file extension for file in mod, %s => %s", pFile->GetFilePointer().c_str(), CCatFile::PckChangeExtension(pFile->GetFilePointer().ToString()).c_str());
|
| 1111 |
pFile->SetFilename(CCatFile::PckChangeExtension(pFile->GetFilePointer()));
|
1111 |
pFile->SetFilename(CCatFile::PckChangeExtension(pFile->GetFilePointer().ToString()));
|
| 1112 |
}
|
1112 |
}
|
| 1113 |
|
1113 |
|
| 1114 |
return true;
|
1114 |
return true;
|
| 1115 |
}
|
1115 |
}
|
| 1116 |
|
1116 |
|