X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=doc%2Fmd%2FDownload-and-Installation.md;h=b82590f25acc04435edf24d2fbccb2b9f837f5eb;hb=6e1df6013e8b448d83c4b7fceb86877c53e81f1c;hp=e64d1a43e25b55c4d53e64579e625335eb02b2b4;hpb=76c3a4dbed11b9a5df2437db00e96608244bd693;p=github%2Fshaarli%2FShaarli.git diff --git a/doc/md/Download-and-Installation.md b/doc/md/Download-and-Installation.md index e64d1a43..b82590f2 100644 --- a/doc/md/Download-and-Installation.md +++ b/doc/md/Download-and-Installation.md @@ -15,7 +15,7 @@ Using one of the following methods: - by downloading full release archives including all dependencies - by downloading Github archives - by cloning the Git repository -- using Docker: [see the documentation](docker/shaarli-images) +- using Docker: [see the documentation](docker/shaarli-images.md) -------------------------------------------------------------------------------- @@ -25,11 +25,11 @@ Using one of the following methods: 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.1` +The current latest released version is `v0.9.7` ```bash -$ wget https://github.com/shaarli/Shaarli/releases/download/v0.9.1/shaarli-v0.9.1-full.zip -$ unzip shaarli-v0.9.1-full.zip +$ wget https://github.com/shaarli/Shaarli/releases/download/v0.9.7/shaarli-v0.9.7-full.zip +$ unzip shaarli-v0.9.7-full.zip $ mv Shaarli /path/to/shaarli/ ``` @@ -38,12 +38,14 @@ $ 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 [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,16 +93,19 @@ $ 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: ```bash -# clone the repository +# clone the repository $ 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 ```