kiwix/kiwix-tools
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-tools.git synced 2025-09-25 05:10:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

+ Small beautification

Browse Source
This commit is contained in:
kelson42 2014-05-30 13:17:09 +02:00
parent 461aa5c1f9
commit 54050e2f85
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/launcher/kiwix-launcher.cpp
View File

@ -97,7 +97,7 @@ int main(int argc, char *argv[]) {
xulrunnerPossibleDirectories.push_back(*directoriesIt);
}
/* Find xulrunner (binary) path */
/* Possible xulrunner binary names */
std::vector<std::string> xulrunnerPossibleNames;
xulrunnerPossibleNames.push_back(std::string("xulrunner") + std::string(EXEXT));
xulrunnerPossibleNames.push_back(std::string("xulrunner-bin") + std::string(EXEXT));
@ -107,8 +107,9 @@ int main(int argc, char *argv[]) {
xulrunnerPossibleNames.push_back(std::string("xulrunner-") + std::string(MAJOR_GECKO_VERSION));
xulrunnerPossibleNames.push_back(std::string("xulrunner-") + std::string(MINOR_GECKO_VERSION));
std::vector<std::string>::iterator filesIt;
/* Find xulrunner (binary) path */
string xulrunnerPath;
std::vector<std::string>::iterator filesIt;
directoriesIt = xulrunnerPossibleDirectories.begin();
while (xulrunnerPath.empty() && directoriesIt != xulrunnerPossibleDirectories.end()) {
if (fileExists(*directoriesIt)) {
@ -125,7 +126,7 @@ int main(int argc, char *argv[]) {
directoriesIt++;
}
if (!fileExists(xulrunnerPath)) {
perror("Unable to find neither the 'xulrunner-bin' nor the 'xulrunner' binary");
perror("Error: unable to find the xulrunner binary.");
return EXIT_FAILURE;
}
@ -155,7 +156,7 @@ int main(int argc, char *argv[]) {
filesIt++;
};
if (!fileExists(xulrunnerPath)) {
perror("Unable to find the application.ini file");
perror("Error: unable to find the application.ini file.");
return EXIT_FAILURE;
}