diff --git a/README.md b/README.md index b0939d6..45fa49c 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ If your build system cannot produce such install trees or you prefer to bundle e An example run could look like this: ```bash -./linuxdeploy*.AppImage --app-name myapp --appdir AppDir --init-appdir -e myapp -d myapp.desktop -i myapp_64x64.png +./linuxdeploy*.AppImage --appdir AppDir --init-appdir -e myapp -d myapp.desktop -i myapp_64x64.png ``` Of course both approaches can be combined, e.g., you can bundle additional executables with your main app. diff --git a/include/linuxdeploy/core/appdir.h b/include/linuxdeploy/core/appdir.h index de7f78e..55677ac 100644 --- a/include/linuxdeploy/core/appdir.h +++ b/include/linuxdeploy/core/appdir.h @@ -79,12 +79,6 @@ namespace linuxdeploy { // create symlinks for AppRun, desktop file and icon in the AppDir root directory bool createLinksInAppDirRoot(const desktopfile::DesktopFile& desktopFile, boost::filesystem::path customAppRunPath = ""); - // set application name of primary "entry point" application - // icons and other resources will then automatically be renamed using this value in order to - // make the deployment easier by not requiring special filenames - // resources' filenames should be prefixed with this value (example: linuxdeploy_48x48.png) - void setAppName(const std::string& appName); - // list all executables in /usr/bin // this function does not perform a recursive search, but only searches the bin directory std::vector listExecutables(); diff --git a/src/core/appdir.cpp b/src/core/appdir.cpp index b586000..5cbebce 100644 --- a/src/core/appdir.cpp +++ b/src/core/appdir.cpp @@ -796,10 +796,6 @@ namespace linuxdeploy { return d->deployFile(from, to, true); } - void AppDir::setAppName(const std::string& appName) { - d->appName = appName; - } - std::vector AppDir::listExecutables() { std::vector executables; diff --git a/src/main.cpp b/src/main.cpp index e3a14fb..9931d1c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -30,7 +30,7 @@ int main(int argc, char** argv) { args::Flag initAppDir(parser, "", "Create basic AppDir structure", {"init-appdir"}); args::ValueFlag appDirPath(parser, "appdir", "Path to target AppDir", {"appdir"}); - args::ValueFlag appName(parser, "app-name", "Application name (used to initialize desktop file and name icons etc.)", {'n', "app-name"}); + args::ValueFlag appName(parser, "app-name", "deprecated, please don't use it any more", {'n', "app-name"}); args::ValueFlagList sharedLibraryPaths(parser, "library", "Shared library to deploy", {'l', "library"}); @@ -91,8 +91,7 @@ int main(int argc, char** argv) { appdir::AppDir appDir(appDirPath.Get()); if (appName) { - ldLog() << std::endl << "-- Deploying application \"" << LD_NO_SPACE << appName.Get() << LD_NO_SPACE << "\" --" << std::endl; - appDir.setAppName(appName.Get()); + ldLog() << LD_WARNING << std::endl << "--app-name parameter is deprecated, please don't use it any more" << std::endl; } // initialize AppDir with common directories on request