Browse Source

Exit with error code if AppImage generation fails

master
probonopd 8 years ago
parent
commit
b1f3506c36
  1. 5
      linuxdeployqt/main.cpp
  2. 3
      shared/shared.cpp
  3. 2
      shared/shared.h

5
linuxdeployqt/main.cpp

@ -207,7 +207,10 @@ int main(int argc, char **argv)
stripAppBinary(appDirPath); stripAppBinary(appDirPath);
if (appimage) { if (appimage) {
createAppImage(appDirPath); int result = createAppImage(appDirPath);
if(result =! 0){
exit(result);
}
} }
return 0; return 0;

3
shared/shared.cpp

@ -1110,7 +1110,7 @@ bool checkAppImagePrerequisites(const QString &appDirPath)
return true; return true;
} }
void createAppImage(const QString &appDirPath) int createAppImage(const QString &appDirPath)
{ {
QString appImagePath = appDirPath + ".AppImage"; QString appImagePath = appDirPath + ".AppImage";
@ -1129,4 +1129,5 @@ void createAppImage(const QString &appDirPath)
} }
QString appImageCommand = "AppImageAssistant '" + appDirPath +"' '" + appImagePath + "'"; QString appImageCommand = "AppImageAssistant '" + appDirPath +"' '" + appImagePath + "'";
int ret = system(appImageCommand.toUtf8().constData()); int ret = system(appImageCommand.toUtf8().constData());
return ret;
} }

2
shared/shared.h

@ -120,7 +120,7 @@ void runStrip(const QString &binaryPath);
void stripAppBinary(const QString &bundlePath); void stripAppBinary(const QString &bundlePath);
QString findAppBinary(const QString &appDirPath); QString findAppBinary(const QString &appDirPath);
QStringList findAppLibraries(const QString &appDirPath); QStringList findAppLibraries(const QString &appDirPath);
void createAppImage(const QString &appBundlePath); int createAppImage(const QString &appBundlePath);
bool checkAppImagePrerequisites(const QString &appBundlePath); bool checkAppImagePrerequisites(const QString &appBundlePath);
#endif #endif

Loading…
Cancel
Save