diff --git a/README.md b/README.md index 968e225b15..9dc341dcfc 100644 --- a/README.md +++ b/README.md @@ -18,11 +18,11 @@ Three types of applications are available: for the **desktop** (Windows, macOS a ## Desktop applications -Operating System | Download ------------------|-------- -Windows (64-bit only) | Get it on Windows -macOS | Get it on macOS -Linux | Get it on Linux +Operating System | Download | Alternative +-----------------|--------|------------------- +Windows (64-bit only) | Get it on Windows | +macOS | Get it on macOS | +Linux | Get it on Linux | An Arch Linux package [is also available](#terminal-application). ## Mobile applications @@ -37,7 +37,7 @@ Operating system | Method -----------------|---------------- macOS | `brew install joplin` Linux or Windows (via [WSL](https://msdn.microsoft.com/en-us/commandline/wsl/faq?f=255&MSPPError=-2147217396)) | **Important:** First, [install Node 8+](https://nodejs.org/en/download/package-manager/). Node 8 is LTS but not yet available everywhere so you might need to manually install it.

`NPM_CONFIG_PREFIX=~/.joplin-bin npm install -g joplin`
`sudo ln -s ~/.joplin-bin/bin/joplin /usr/bin/joplin`

By default, the application binary will be installed under `~/.joplin-bin`. You may change this directory if needed. Alternatively, if your npm permissions are setup as described [here](https://docs.npmjs.com/getting-started/fixing-npm-permissions#option-2-change-npms-default-directory-to-another-directory) (Option 2) then simply running `npm -g install joplin` would work. -Arch Linux | An Arch Linux pakage is available [here](https://aur.archlinux.org/packages/joplin/). To install it, use an AUR wrapper such as yay: `yay -S joplin`. For support, please go to the [GitHub repo](https://github.com/masterkorp/joplin-pkgbuild). +Arch Linux | An Arch Linux pakage is available [here](https://aur.archlinux.org/packages/joplin/). To install it, use an AUR wrapper such as yay: `yay -S joplin`. Both the CLI tool (type `joplin`) and desktop app (type `joplin-desktop`) are packaged. For support, please go to the [GitHub repo](https://github.com/masterkorp/joplin-pkgbuild). To start it, type `joplin`. diff --git a/docs/index.html b/docs/index.html index 2c104d0e85..07798ae045 100644 --- a/docs/index.html +++ b/docs/index.html @@ -264,20 +264,24 @@ Operating System Download +Alternative Windows (64-bit only) Get it on Windows + macOS Get it on macOS + Linux Get it on Linux +An Arch Linux package is also available. @@ -322,7 +326,7 @@ Arch Linux -An Arch Linux pakage is available here. To install it, use an AUR wrapper such as yay: yay -S joplin. For support, please go to the GitHub repo. +An Arch Linux pakage is available here. To install it, use an AUR wrapper such as yay: yay -S joplin. Both the CLI tool (type joplin) and desktop app (type joplin-desktop) are packaged. For support, please go to the GitHub repo. @@ -479,14 +483,14 @@ $$ Croatian hr_HR -Hrvoje Mandić trbuhom@net.hr +Hrvoje Mandić trbuhom@net.hr 62% Czech cs_CZ -Lukas Helebrandt lukas@aiya.cz +Lukas Helebrandt lukas@aiya.cz 97% @@ -500,7 +504,7 @@ $$ Deutsch de_DE -Tobias Grasse mail@tobias-grasse.net +Tobias Grasse mail@tobias-grasse.net 96% @@ -514,7 +518,7 @@ $$ Español es_ES -Fernando Martín f@mrtn.es +Fernando Martín f@mrtn.es 100% @@ -528,7 +532,7 @@ $$ Galician gl_ES -Marcos Lans marcoslansgarza@gmail.com +Marcos Lans marcoslansgarza@gmail.com 97% @@ -549,14 +553,14 @@ $$ Português (Brasil) pt_BR -Renato Nunes Bastos rnbastos@gmail.com +Renato Nunes Bastos rnbastos@gmail.com 95% Русский ru_RU -Artyom Karlov artyom.karlov@gmail.com +Artyom Karlov artyom.karlov@gmail.com 96% diff --git a/docs/terminal/index.html b/docs/terminal/index.html index adaf3d9ecf..c0067da8e8 100644 --- a/docs/terminal/index.html +++ b/docs/terminal/index.html @@ -272,7 +272,7 @@ Arch Linux -An Arch Linux pakage is available here. To install it, use an AUR wrapper such as yay: yay -S joplin. For support, please go to the GitHub repo. +An Arch Linux pakage is available here. To install it, use an AUR wrapper such as yay: yay -S joplin. Both the CLI tool (type joplin) and desktop app (type joplin-desktop) are packaged. For support, please go to the GitHub repo. diff --git a/readme/terminal.md b/readme/terminal.md index 536dc26a21..91a44e7a7e 100644 --- a/readme/terminal.md +++ b/readme/terminal.md @@ -14,7 +14,7 @@ Operating system | Method -----------------|---------------- macOS | `brew install joplin` Linux or Windows (via [WSL](https://msdn.microsoft.com/en-us/commandline/wsl/faq?f=255&MSPPError=-2147217396)) | **Important:** First, [install Node 8+](https://nodejs.org/en/download/package-manager/). Node 8 is LTS but not yet available everywhere so you might need to manually install it.

`NPM_CONFIG_PREFIX=~/.joplin-bin npm install -g joplin`
`sudo ln -s ~/.joplin-bin/bin/joplin /usr/bin/joplin`

By default, the application binary will be installed under `~/.joplin-bin`. You may change this directory if needed. Alternatively, if your npm permissions are setup as described [here](https://docs.npmjs.com/getting-started/fixing-npm-permissions#option-2-change-npms-default-directory-to-another-directory) (Option 2) then simply running `npm -g install joplin` would work. -Arch Linux | An Arch Linux pakage is available [here](https://aur.archlinux.org/packages/joplin/). To install it, use an AUR wrapper such as yay: `yay -S joplin`. For support, please go to the [GitHub repo](https://github.com/masterkorp/joplin-pkgbuild). +Arch Linux | An Arch Linux pakage is available [here](https://aur.archlinux.org/packages/joplin/). To install it, use an AUR wrapper such as yay: `yay -S joplin`. Both the CLI tool (type `joplin`) and desktop app (type `joplin-desktop`) are packaged. For support, please go to the [GitHub repo](https://github.com/masterkorp/joplin-pkgbuild). To start it, type `joplin`.