X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=doc%2Fmd%2FDownload-and-Installation.md;h=ec68762e4a72e3d688fce212d58c411c7b22cca9;hb=6128ab6a55430a2b705be31ff417c0c552a0db1f;hp=05f0c8f2db3d5fe6bcddf32ab5d6c40c15eece6a;hpb=faa5b2ce61ddc871eab2919f92d683c917730b10;p=github%2Fshaarli%2FShaarli.git diff --git a/doc/md/Download-and-Installation.md b/doc/md/Download-and-Installation.md index 05f0c8f2..ec68762e 100644 --- a/doc/md/Download-and-Installation.md +++ b/doc/md/Download-and-Installation.md @@ -1,8 +1,7 @@ To install Shaarli, simply place the files in a directory under your webserver's Document Root (or directly at the document root). -Also, please make sure your server meets the [requirements](Server-requirements) -and is properly [configured](Server-configuration). +Also, please make sure your server is properly [configured](Server-configuration.md). Multiple releases branches are available: @@ -23,13 +22,13 @@ Using one of the following methods: ### Download as an archive -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. +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. -The current latest released version is `v0.9.6` +The current latest released version is `v0.10.4` ```bash -$ wget https://github.com/shaarli/Shaarli/releases/download/v0.9.6/shaarli-v0.9.6-full.zip -$ unzip shaarli-v0.9.6-full.zip +$ wget https://github.com/shaarli/Shaarli/releases/download/v0.10.4/shaarli-v0.10.4-full.zip +$ unzip shaarli-v0.10.4-full.zip $ mv Shaarli /path/to/shaarli/ ``` @@ -37,13 +36,15 @@ $ mv Shaarli /path/to/shaarli/ Cloning using `git` or downloading Github branches as zip files requires additional steps: - * Install [Composer](Unit-tests.md#install_composer) to manage Shaarli dependencies. + * Install [Composer](Unit-tests.md#install_composer) to manage third-party [PHP dependencies](3rd-party-libraries.md#composer). + * Install [yarn](https://yarnpkg.com/lang/en/docs/install/) to build the frontend dependencies. * Install [python3-virtualenv](https://pypi.python.org/pypi/virtualenv) to build the local HTML documentation. ``` $ mkdir -p /path/to/shaarli && cd /path/to/shaarli/ $ git clone -b latest https://github.com/shaarli/Shaarli.git . $ composer install --no-dev --prefer-dist +$ make build_frontend $ make translate $ make htmldoc ``` @@ -91,7 +92,9 @@ $ composer install --no-dev --prefer-dist _Use at your own risk!_ -Install [Composer](Unit-tests.md#install_composer) to manage Shaarli dependencies. +Install [Composer](Unit-tests.md#install_composer) to manage Shaarli PHP dependencies, +and [yarn](https://yarnpkg.com/lang/en/docs/install/) +for front-end dependencies. To get the latest changes from the `master` branch: @@ -101,6 +104,7 @@ $ git clone https://github.com/shaarli/Shaarli.git -b master /path/to/shaarli/ # install/update third-party dependencies $ cd /path/to/shaarli $ composer install --no-dev --prefer-dist +$ make build_frontend $ make translate $ make htmldoc ```