diff --git a/README.md b/README.md index e1edfcbbf7..f424e42397 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,11 @@ iOS |
`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. + On macOS: brew install joplin diff --git a/docs/index.html b/docs/index.html index 221660eaa9..1476ea9613 100644 --- a/docs/index.html +++ b/docs/index.html @@ -304,6 +304,24 @@

Terminal application

+ + + + + + + + + + + + + + + + + +
Operating systemMethod
macOSbrew install joplin
Linux or Windows (via WSL)Important: First, install Node 8+. 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 (Option 2) then simply running npm -g install joplin would work.

On macOS:

brew install joplin
 

On Linux or Windows (via WSL):

@@ -464,14 +482,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% @@ -485,7 +503,7 @@ $$ Deutsch de_DE -Tobias Grasse mail@tobias-grasse.net +Tobias Grasse mail@tobias-grasse.net 96% @@ -499,7 +517,7 @@ $$ Español es_ES -Fernando Martín f@mrtn.es +Fernando Martín f@mrtn.es 100% @@ -513,7 +531,7 @@ $$ Galician gl_ES -Marcos Lans marcoslansgarza@gmail.com +Marcos Lans marcoslansgarza@gmail.com 97% @@ -534,14 +552,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 92889d580d..adaf3d9ecf 100644 --- a/docs/terminal/index.html +++ b/docs/terminal/index.html @@ -254,13 +254,28 @@

The notes can be synchronised with various targets including the file system (for example with a network directory), Nextcloud, Dropbox, OneDrive or WebDAV. When synchronising the notes, notebooks, tags and other metadata are saved to plain text files which can be easily inspected, backed up and moved around.

Installation

-

On macOS:

-
brew install joplin
-

On Linux or Windows (via WSL):

-

Important: First, install Node 8+. 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 (Option 2) then simply running npm -g install joplin would work.

+ + + + + + + + + + + + + + + + + + + + + +
Operating systemMethod
macOSbrew install joplin
Linux or Windows (via WSL)Important: First, install Node 8+. 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 (Option 2) then simply running npm -g install joplin would work.
Arch LinuxAn 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.

To start it, type joplin.

Demo

The demo application shows various Wikipedia articles converted to Markdown and organised into notebooks, as well as an example to-do list, in order to test and demonstrate the application. The demo application and its settings will be installed in a separate directory so as not to interfere with any existing Joplin application.

diff --git a/readme/terminal.md b/readme/terminal.md index 323c71878a..536dc26a21 100644 --- a/readme/terminal.md +++ b/readme/terminal.md @@ -10,18 +10,11 @@ The notes can be [synchronised](#synchronisation) with various targets including # Installation -On macOS: - - brew install joplin - -On 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. +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). To start it, type `joplin`.