encounter/linuxdeploy
0
0
Fork 0
mirror of https://github.com/encounter/linuxdeploy.git synced 2026-03-30 11:18:58 -07:00
Code Issues Packages Projects Releases Wiki Activity

Removing AppRun file existence check as createLinksInAppDirRoot also perform this check

Browse Source
This commit is contained in:
Alexis Lopez Zubieta
2018-11-04 18:03:43 -06:00
parent cab57f86d6
commit 7ff05ca98e
1 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/linuxdeploy.cpp
+16 -23
View File
@@ -22,35 +22,28 @@ namespace linuxdeploy {
// search for desktop file and deploy it to AppDir root
ldLog() << std::endl << "-- Deploying files into AppDir root directory --" << std::endl;
if (is_regular_file(appDir.path() / "AppRun")) {
if (!customAppRunPath.empty())
ldLog() << LD_WARNING << "AppRun exists but custom AppRun specified, overwriting existing AppRun"
<< std::endl;
else
ldLog() << LD_WARNING << "AppRun exists, skipping deployment" << std::endl;
} else {
auto deployedDesktopFiles = appDir.deployedDesktopFiles();
auto deployedDesktopFiles = appDir.deployedDesktopFiles();
try {
desktopfile::DesktopFile desktopFile = getMainDesktopFile(desktopFilePaths, deployedDesktopFiles);
try {
desktopfile::DesktopFile desktopFile = getMainDesktopFile(desktopFilePaths, deployedDesktopFiles);
ldLog() << "Deploying desktop file:" << desktopFile.path() << std::endl;
ldLog() << "Deploying desktop file:" << desktopFile.path() << std::endl;
bool rv;
bool rv;
if (!customAppRunPath.empty()) {
rv = appDir.createLinksInAppDirRoot(desktopFile, customAppRunPath);
} else {
rv = appDir.createLinksInAppDirRoot(desktopFile);
}
if (!rv) {
return 1;
}
} catch (const std::runtime_error& er) {
return -1;
if (!customAppRunPath.empty()) {
rv = appDir.createLinksInAppDirRoot(desktopFile, customAppRunPath);
} else {
rv = appDir.createLinksInAppDirRoot(desktopFile);
}
if (!rv) {
return 1;
}
} catch (const std::runtime_error& er) {
return -1;
}
return true;
}