From 2ed96e996950f9cf19f1e727f4e790cfdeb0a6a2 Mon Sep 17 00:00:00 2001 From: Michael Baumgartner Date: Tue, 17 Oct 2023 16:18:30 +0200 Subject: [PATCH] [GH 2874] Fix category for deb and clairfy directory information in README for linux (#2884) * Remove expliced category from deb The expliced category value for deb is not correct. The linux section has a correct category value and deb is part of its target. So the category from linux should be applied if there is no expliced one in the deb section. Issue: mattermost/desktop#2874 * Linux README: clarify where to find directory Change the example directory to the path, where it is at a deb installation. Add a hint that a reader in a local README already found the correct directory. Issue: mattermost/desktop#2874 --- electron-builder.json | 1 - src/assets/linux/README.md | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/electron-builder.json b/electron-builder.json index 8fed14e4..7ebb849f 100644 --- a/electron-builder.json +++ b/electron-builder.json @@ -48,7 +48,6 @@ "libxtst6", "libnss3" ], - "category": "contrib/net", "priority": "optional" }, "asarUnpack": [ diff --git a/src/assets/linux/README.md b/src/assets/linux/README.md index f4e65788..2c2477ba 100644 --- a/src/assets/linux/README.md +++ b/src/assets/linux/README.md @@ -12,14 +12,14 @@ If you installed the application via a package manager, it's ready to use in your system. Please follow the [User Guide](#user-guide) for further information. -Otherwise, first locate the extracted directory in your desired directory (e.g. `/opt/mattermost-desktop-`) and follow the steps below. +Otherwise, first locate the extracted directory in your desired directory (e.g. `/opt/mattermost-desktop`) and follow the steps below. (This directory also contains this README here.) ### Desktop launcher Execute the script file to create a `Mattermost.desktop` file. ``` -/opt/mattermost-desktop-/create_desktop_file.sh +/opt/mattermost-desktop/create_desktop_file.sh ``` Then move it to the appropriate directory of your desktop environment. For example, on Ubuntu Unity it's `~/.local/share/applications/` for the current user. @@ -33,14 +33,14 @@ mv Mattermost.desktop ~/.local/share/applications/ Set a `PATH` environment variable to enable launching from the terminal. For example, you can append the following line into `~/.bashrc`. ```sh -# assuming that /opt/mattermost-desktop-/mattermost-desktop is the executable file. -export PATH=$PATH:/opt/mattermost-desktop- +# assuming that /opt/mattermost-desktop/mattermost-desktop is the executable file. +export PATH=$PATH:/opt/mattermost-desktop ``` Alternatively, you can also create a symbolic link for the application. ```sh -sudo ln -s /opt/mattermost-desktop-/mattermost-desktop /usr/local/bin/ +sudo ln -s /opt/mattermost-desktop/mattermost-desktop /usr/local/bin/ ``` You're now all set! See the [User Guide](#user-guide) below for instructions.