diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-03-10 12:41:45 +0100 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-03-10 12:43:03 +0100 |
| commit | 24c16007bbe1b840749809424f01a551d78ab829 (patch) | |
| tree | 919eba9fb5669d69a9414f95450e296483028fc8 | |
| parent | 4c5197959548686539a0d0916e47fcee2215e87a (diff) | |
| download | wallabag-24c16007bbe1b840749809424f01a551d78ab829.tar.gz wallabag-24c16007bbe1b840749809424f01a551d78ab829.tar.zst wallabag-24c16007bbe1b840749809424f01a551d78ab829.zip | |
Finally back to composer create-project but with --keep-vcs option
| -rw-r--r-- | README.md | 7 | ||||
| -rw-r--r-- | docs/en/user/installation.rst | 6 | ||||
| -rw-r--r-- | docs/fr/user/installation.rst | 6 |
3 files changed, 4 insertions, 15 deletions
| @@ -11,14 +11,11 @@ More informations on our website: [wallabag.org](https://wallabag.org) | |||
| 11 | # Want to test the v2? | 11 | # Want to test the v2? |
| 12 | Keep in mind it's an **unstable** branch, everything can be broken :) | 12 | Keep in mind it's an **unstable** branch, everything can be broken :) |
| 13 | 13 | ||
| 14 | If you don't have it yet, please [install composer](https://getcomposer.org/download/) and git. | 14 | If you don't have it yet, please [install composer](https://getcomposer.org/download/). |
| 15 | Then you can install wallabag by executing the following commands: | 15 | Then you can install wallabag by executing the following commands: |
| 16 | 16 | ||
| 17 | ``` | 17 | ``` |
| 18 | git clone git@github.com:wallabag/wallabag.git | 18 | SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.2" --no-dev --keep-vcs |
| 19 | cd wallabag | ||
| 20 | git checkout 2.0.0-beta.2 | ||
| 21 | SYMFONY_ENV=prod composer install --no-dev -o | ||
| 22 | php bin/console wallabag:install --env=prod | 19 | php bin/console wallabag:install --env=prod |
| 23 | php bin/console server:run --env=prod | 20 | php bin/console server:run --env=prod |
| 24 | ``` | 21 | ``` |
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index f7c79ccf..88647333 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst | |||
| @@ -48,12 +48,8 @@ To install wallabag itself, you must run these two commands: | |||
| 48 | 48 | ||
| 49 | :: | 49 | :: |
| 50 | 50 | ||
| 51 | git clone git@github.com:wallabag/wallabag.git | 51 | SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.2" --no-dev --keep-vcs |
| 52 | cd wallabag | ||
| 53 | git checkout 2.0.0-beta.2 | ||
| 54 | SYMFONY_ENV=prod composer install --no-dev -o | ||
| 55 | php bin/console wallabag:install --env=prod | 52 | php bin/console wallabag:install --env=prod |
| 56 | php bin/console server:run --env=prod | ||
| 57 | 53 | ||
| 58 | To start php's build-in server and test if everything did install correctly, you can do: | 54 | To start php's build-in server and test if everything did install correctly, you can do: |
| 59 | 55 | ||
diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst index 8e8e225b..1983ae25 100644 --- a/docs/fr/user/installation.rst +++ b/docs/fr/user/installation.rst | |||
| @@ -46,12 +46,8 @@ Pour installer wallabag, vous devez exécuter ces deux commandes : | |||
| 46 | 46 | ||
| 47 | :: | 47 | :: |
| 48 | 48 | ||
| 49 | git clone git@github.com:wallabag/wallabag.git | 49 | SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.2" --no-dev --keep-vcs |
| 50 | cd wallabag | ||
| 51 | git checkout 2.0.0-beta.2 | ||
| 52 | SYMFONY_ENV=prod composer install --no-dev -o | ||
| 53 | php bin/console wallabag:install --env=prod | 50 | php bin/console wallabag:install --env=prod |
| 54 | php bin/console server:run --env=prod | ||
| 55 | 51 | ||
| 56 | Pour démarrer le serveur interne à php et vérifier que tout s'est installé correctement, vous pouvez exécuter : | 52 | Pour démarrer le serveur interne à php et vérifier que tout s'est installé correctement, vous pouvez exécuter : |
| 57 | 53 | ||