diff options
Diffstat (limited to 'doc/md/Download-and-Installation.md')
-rw-r--r-- | doc/md/Download-and-Installation.md | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/doc/md/Download-and-Installation.md b/doc/md/Download-and-Installation.md index 0fdbd27d..14649e06 100644 --- a/doc/md/Download-and-Installation.md +++ b/doc/md/Download-and-Installation.md | |||
@@ -1,8 +1,7 @@ | |||
1 | To install Shaarli, simply place the files in a directory under your webserver's | 1 | To install Shaarli, simply place the files in a directory under your webserver's |
2 | Document Root (or directly at the document root). | 2 | Document Root (or directly at the document root). |
3 | 3 | ||
4 | Also, please make sure your server meets the [requirements](Server-requirements) | 4 | Also, please make sure your server is properly [configured](Server-configuration). |
5 | and is properly [configured](Server-configuration). | ||
6 | 5 | ||
7 | Multiple releases branches are available: | 6 | Multiple releases branches are available: |
8 | 7 | ||
@@ -23,13 +22,13 @@ Using one of the following methods: | |||
23 | 22 | ||
24 | ### Download as an archive | 23 | ### Download as an archive |
25 | 24 | ||
26 | In most cases, you should download the latest Shaarli release from the [releases](https://github.com/shaarli/Shaarli/releases) page. **Download our *shaarli-full* archive** to include dependencies. | 25 | In most cases, you should download the latest Shaarli release from the [releases](https://github.com/shaarli/Shaarli/releases) page. Download our **shaarli-full** archive to include dependencies. |
27 | 26 | ||
28 | The current latest released version is `v0.9.3` | 27 | The current latest released version is `v0.9.7` |
29 | 28 | ||
30 | ```bash | 29 | ```bash |
31 | $ wget https://github.com/shaarli/Shaarli/releases/download/v0.9.3/shaarli-v0.9.3-full.zip | 30 | $ wget https://github.com/shaarli/Shaarli/releases/download/v0.9.7/shaarli-v0.9.7-full.zip |
32 | $ unzip shaarli-v0.9.3-full.zip | 31 | $ unzip shaarli-v0.9.7-full.zip |
33 | $ mv Shaarli /path/to/shaarli/ | 32 | $ mv Shaarli /path/to/shaarli/ |
34 | ``` | 33 | ``` |
35 | 34 | ||
@@ -37,13 +36,15 @@ $ mv Shaarli /path/to/shaarli/ | |||
37 | 36 | ||
38 | Cloning using `git` or downloading Github branches as zip files requires additional steps: | 37 | Cloning using `git` or downloading Github branches as zip files requires additional steps: |
39 | 38 | ||
40 | * Install [Composer](Unit-tests.md#install_composer) to manage Shaarli dependencies. | 39 | * Install [Composer](Unit-tests.md#install_composer) to manage third-party [PHP dependencies](3rd-party-libraries.md#composer). |
40 | * Install [yarn](https://yarnpkg.com/lang/en/docs/install/) to build the frontend dependencies. | ||
41 | * Install [python3-virtualenv](https://pypi.python.org/pypi/virtualenv) to build the local HTML documentation. | 41 | * Install [python3-virtualenv](https://pypi.python.org/pypi/virtualenv) to build the local HTML documentation. |
42 | 42 | ||
43 | ``` | 43 | ``` |
44 | $ mkdir -p /path/to/shaarli && cd /path/to/shaarli/ | 44 | $ mkdir -p /path/to/shaarli && cd /path/to/shaarli/ |
45 | $ git clone -b latest https://github.com/shaarli/Shaarli.git . | 45 | $ git clone -b latest https://github.com/shaarli/Shaarli.git . |
46 | $ composer install --no-dev --prefer-dist | 46 | $ composer install --no-dev --prefer-dist |
47 | $ make build_frontend | ||
47 | $ make translate | 48 | $ make translate |
48 | $ make htmldoc | 49 | $ make htmldoc |
49 | ``` | 50 | ``` |
@@ -91,7 +92,9 @@ $ composer install --no-dev --prefer-dist | |||
91 | 92 | ||
92 | _Use at your own risk!_ | 93 | _Use at your own risk!_ |
93 | 94 | ||
94 | Install [Composer](Unit-tests.md#install_composer) to manage Shaarli dependencies. | 95 | Install [Composer](Unit-tests.md#install_composer) to manage Shaarli PHP dependencies, |
96 | and [yarn](https://yarnpkg.com/lang/en/docs/install/) | ||
97 | for front-end dependencies. | ||
95 | 98 | ||
96 | To get the latest changes from the `master` branch: | 99 | To get the latest changes from the `master` branch: |
97 | 100 | ||
@@ -101,6 +104,7 @@ $ git clone https://github.com/shaarli/Shaarli.git -b master /path/to/shaarli/ | |||
101 | # install/update third-party dependencies | 104 | # install/update third-party dependencies |
102 | $ cd /path/to/shaarli | 105 | $ cd /path/to/shaarli |
103 | $ composer install --no-dev --prefer-dist | 106 | $ composer install --no-dev --prefer-dist |
107 | $ make build_frontend | ||
104 | $ make translate | 108 | $ make translate |
105 | $ make htmldoc | 109 | $ make htmldoc |
106 | ``` | 110 | ``` |