audacity/linuxdeploy
1
0
Fork 0
mirror of https://github.com/audacity/linuxdeploy.git synced 2026-04-13 06:51:05 -05:00
Code Issues Packages Projects Releases 1 Wiki Activity

Replace args::ValueFlagList by vector<string> in deployAppDirRootFiles function signature

Browse Source
This commit is contained in:
Alexis Lopez Zubieta
2018-11-04 15:05:49 -06:00
parent 1fa90fbd5c
commit 2cdedc252c
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/linuxdeploy.cpp
View File

@@ -14,13 +14,13 @@ using namespace linuxdeploy::util;
namespace bf = boost::filesystem;
namespace linuxdeploy {
int deployAppDirRootFiles(args::ValueFlagList<std::string>& desktopFilePaths,
args::ValueFlag<std::string>& customAppRunPath, appdir::AppDir& appDir) {
int deployAppDirRootFiles(std::vector<std::string> desktopFilePaths,
std::string customAppRunPath, appdir::AppDir& appDir) {
// 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)
if (!customAppRunPath.empty())
ldLog() << LD_WARNING << "AppRun exists but custom AppRun specified, overwriting existing AppRun"
<< std::endl;
else
@@ -35,9 +35,9 @@ namespace linuxdeploy {
<< "Could not find desktop file in AppDir, cannot create links for AppRun, desktop file and icon in AppDir root"
<< std::endl;
} else {
if (!desktopFilePaths.Get().empty()) {
if (!desktopFilePaths.empty()) {
auto firstDeployedDesktopFileName = boost::filesystem::path(
desktopFilePaths.Get().front()).filename().string();
desktopFilePaths.front()).filename().string();
auto desktopFileMatchingName = find_if(
deployedDesktopFiles.begin(),
@@ -65,8 +65,8 @@ namespace linuxdeploy {
bool rv;
if (customAppRunPath) {
rv = appDir.createLinksInAppDirRoot(desktopFile, customAppRunPath.Get());
if (!customAppRunPath.empty()) {
rv = appDir.createLinksInAppDirRoot(desktopFile, customAppRunPath);
} else {
rv = appDir.createLinksInAppDirRoot(desktopFile);
}

6
src/linuxdeploy.h
View File

@@ -6,9 +6,9 @@
#include <linuxdeploy/core/appdir.h>
#include <linuxdeploy/core/log.h>
#include <linuxdeploy/util/util.h>
#include <args.hxx>
namespace linuxdeploy {
int deployAppDirRootFiles(args::ValueFlagList<std::string>& desktopFilePaths,
args::ValueFlag<std::string>& customAppRunPath,
int deployAppDirRootFiles(std::vector<std::string> desktopFilePaths,
std::string customAppRunPath,
linuxdeploy::core::appdir::AppDir& appDir);
}

2
src/main.cpp
View File

@@ -254,7 +254,7 @@ int main(int argc, char** argv) {
return 1;
}
}
if (!linuxdeploy::deployAppDirRootFiles(desktopFilePaths, customAppRunPath, appDir))
if (!linuxdeploy::deployAppDirRootFiles(desktopFilePaths.Get(), customAppRunPath.Get(), appDir))
return 1;
if (outputPlugins) {