From 83be3dc0972fb04371df247c21a6f73f42f9f73d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 8 Mar 2016 11:40:37 +0100 Subject: Prepare files for 2.0.0-beta.2 --- README.md | 8 ++++++-- app/config/config.yml | 2 +- docs/en/user/installation.rst | 6 +++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b7940b36..4e633856 100644 --- a/README.md +++ b/README.md @@ -11,10 +11,14 @@ More informations on our website: [wallabag.org](https://wallabag.org) # Want to test the v2? Keep in mind it's an **unstable** branch, everything can be broken :) -If you don't have it yet, please [install composer](https://getcomposer.org/download/). Then you can install wallabag by executing the following commands: +If you don't have it yet, please [install composer](https://getcomposer.org/download/) and git. +Then you can install wallabag by executing the following commands: ``` -SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.1" --no-dev +git clone git@github.com:wallabag/wallabag.git +cd wallabag +git checkout 2.0.0-beta.2 +SYMFONY_ENV=prod composer install --no-dev php bin/console wallabag:install --env=prod php bin/console server:run --env=prod ``` diff --git a/app/config/config.yml b/app/config/config.yml index 25ecabe7..f0885d9d 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -28,7 +28,7 @@ framework: assets: ~ wallabag_core: - version: 2.0.0-beta.1 + version: 2.0.0-beta.2 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" languages: en: 'English' diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index 385d6595..fe55b804 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst @@ -48,8 +48,12 @@ To install wallabag itself, you must run these two commands: :: - SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.1" --no-dev + git clone git@github.com:wallabag/wallabag.git + cd wallabag + git checkout 2.0.0-beta.2 + SYMFONY_ENV=prod composer install --no-dev php bin/console wallabag:install --env=prod + php bin/console server:run --env=prod To start php's build-in server and test if everything did install correctly, you can do: -- cgit v1.2.3 From 0f4e919100e2ea4594063a5d3c1f79f4e87c64a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 8 Mar 2016 11:42:11 +0100 Subject: French documentation for new installation --- docs/fr/user/installation.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst index a2a5dabf..784b06fe 100644 --- a/docs/fr/user/installation.rst +++ b/docs/fr/user/installation.rst @@ -46,8 +46,12 @@ Pour installer wallabag, vous devez exécuter ces deux commandes : :: - SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.1" --no-dev + git clone git@github.com:wallabag/wallabag.git + cd wallabag + git checkout 2.0.0-beta.2 + SYMFONY_ENV=prod composer install --no-dev php bin/console wallabag:install --env=prod + php bin/console server:run --env=prod Pour démarrer le serveur interne à php et vérifier que tout s'est installé correctement, vous pouvez exécuter : -- cgit v1.2.3 From 4c5197959548686539a0d0916e47fcee2215e87a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 8 Mar 2016 12:08:41 +0100 Subject: Add -o option in composer install command --- README.md | 2 +- docs/en/user/installation.rst | 2 +- docs/fr/user/installation.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4e633856..6572566f 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Then you can install wallabag by executing the following commands: git clone git@github.com:wallabag/wallabag.git cd wallabag git checkout 2.0.0-beta.2 -SYMFONY_ENV=prod composer install --no-dev +SYMFONY_ENV=prod composer install --no-dev -o php bin/console wallabag:install --env=prod php bin/console server:run --env=prod ``` diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index fe55b804..f7c79ccf 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst @@ -51,7 +51,7 @@ To install wallabag itself, you must run these two commands: git clone git@github.com:wallabag/wallabag.git cd wallabag git checkout 2.0.0-beta.2 - SYMFONY_ENV=prod composer install --no-dev + SYMFONY_ENV=prod composer install --no-dev -o php bin/console wallabag:install --env=prod php bin/console server:run --env=prod diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst index 784b06fe..8e8e225b 100644 --- a/docs/fr/user/installation.rst +++ b/docs/fr/user/installation.rst @@ -49,7 +49,7 @@ Pour installer wallabag, vous devez exécuter ces deux commandes : git clone git@github.com:wallabag/wallabag.git cd wallabag git checkout 2.0.0-beta.2 - SYMFONY_ENV=prod composer install --no-dev + SYMFONY_ENV=prod composer install --no-dev -o php bin/console wallabag:install --env=prod php bin/console server:run --env=prod -- cgit v1.2.3 From 24c16007bbe1b840749809424f01a551d78ab829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 10 Mar 2016 12:41:45 +0100 Subject: Finally back to composer create-project but with --keep-vcs option --- README.md | 7 ++----- docs/en/user/installation.rst | 6 +----- docs/fr/user/installation.rst | 6 +----- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 6572566f..c12a84e3 100644 --- a/README.md +++ b/README.md @@ -11,14 +11,11 @@ More informations on our website: [wallabag.org](https://wallabag.org) # Want to test the v2? Keep in mind it's an **unstable** branch, everything can be broken :) -If you don't have it yet, please [install composer](https://getcomposer.org/download/) and git. +If you don't have it yet, please [install composer](https://getcomposer.org/download/). Then you can install wallabag by executing the following commands: ``` -git clone git@github.com:wallabag/wallabag.git -cd wallabag -git checkout 2.0.0-beta.2 -SYMFONY_ENV=prod composer install --no-dev -o +SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.2" --no-dev --keep-vcs php bin/console wallabag:install --env=prod php bin/console server:run --env=prod ``` 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: :: - git clone git@github.com:wallabag/wallabag.git - cd wallabag - git checkout 2.0.0-beta.2 - SYMFONY_ENV=prod composer install --no-dev -o + SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.2" --no-dev --keep-vcs php bin/console wallabag:install --env=prod - php bin/console server:run --env=prod To start php's build-in server and test if everything did install correctly, you can do: 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 : :: - git clone git@github.com:wallabag/wallabag.git - cd wallabag - git checkout 2.0.0-beta.2 - SYMFONY_ENV=prod composer install --no-dev -o + SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.2" --no-dev --keep-vcs php bin/console wallabag:install --env=prod - php bin/console server:run --env=prod Pour démarrer le serveur interne à php et vérifier que tout s'est installé correctement, vous pouvez exécuter : -- cgit v1.2.3 From c118131317742a4b77031af89d19eba3b5eabd24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 10 Mar 2016 13:04:56 +0100 Subject: git clone with prefer-dist option --- README.md | 9 ++++++--- docs/en/user/installation.rst | 5 ++++- docs/fr/user/installation.rst | 5 ++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index c12a84e3..e175b6c3 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,12 @@ If you don't have it yet, please [install composer](https://getcomposer.org/down Then you can install wallabag by executing the following commands: ``` -SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.2" --no-dev --keep-vcs -php bin/console wallabag:install --env=prod -php bin/console server:run --env=prod + git clone https://github.com/wallabag/wallabag.git + cd wallabag + git checkout 2.0.0-beta.2 + SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist + php bin/console wallabag:install --env=prod + php bin/console server:run --env=prod ``` ## License diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index 88647333..99dc0a76 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst @@ -48,7 +48,10 @@ To install wallabag itself, you must run these two commands: :: - SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.2" --no-dev --keep-vcs + git clone https://github.com/wallabag/wallabag.git + cd wallabag + git checkout 2.0.0-beta.2 + SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console wallabag:install --env=prod To start php's build-in server and test if everything did install correctly, you can do: diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst index 1983ae25..9f1d540c 100644 --- a/docs/fr/user/installation.rst +++ b/docs/fr/user/installation.rst @@ -46,7 +46,10 @@ Pour installer wallabag, vous devez exécuter ces deux commandes : :: - SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.2" --no-dev --keep-vcs + git clone https://github.com/wallabag/wallabag.git + cd wallabag + git checkout 2.0.0-beta.2 + SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist php bin/console wallabag:install --env=prod Pour démarrer le serveur interne à php et vérifier que tout s'est installé correctement, vous pouvez exécuter : -- cgit v1.2.3