aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.travis.yml4
-rw-r--r--docs/de/user/installation.rst1
-rw-r--r--docs/de/user/upgrade-2.0.x-2.0.y.rst1
-rw-r--r--docs/de/user/upgrade-2.0.x-2.1.y.rst1
-rw-r--r--docs/en/user/installation.rst1
-rw-r--r--docs/en/user/upgrade-2.0.x-2.0.y.rst1
-rw-r--r--docs/en/user/upgrade-2.0.x-2.1.y.rst1
-rw-r--r--docs/fr/user/installation.rst1
-rw-r--r--docs/fr/user/upgrade-2.0.x-2.0.y.rst1
-rw-r--r--docs/fr/user/upgrade-2.0.x-2.1.y.rst1
-rwxr-xr-xinstall.sh24
-rwxr-xr-xinstall_dev.sh17
12 files changed, 31 insertions, 23 deletions
diff --git a/.travis.yml b/.travis.yml
index c5fe7b01..b0b26b56 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -91,8 +91,8 @@ before_install:
91 - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi; 91 - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
92 92
93script: 93script:
94 - travis_wait bash install.sh 94 - travis_wait bash install_dev.sh
95 - ant prepare-$DB 95 - ant prepare-$DB
96 - phpunit -v 96 - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then phpunit -v ; fi;
97 - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi; 97 - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;
98 - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi; 98 - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;
diff --git a/docs/de/user/installation.rst b/docs/de/user/installation.rst
index f7bc2e4f..7fa8c625 100644
--- a/docs/de/user/installation.rst
+++ b/docs/de/user/installation.rst
@@ -56,6 +56,7 @@ Um wallabag selbst zu installieren, musst du die folgenden Kommandos ausführen:
56 cd wallabag 56 cd wallabag
57 git checkout 2.1.0 57 git checkout 2.1.0
58 ASSETS=build ./install.sh 58 ASSETS=build ./install.sh
59 php bin/console wallabag:install --env=prod
59 60
60Um PHPs eingebauten Server zu starten und zu testen, ob alles korrekt installiert wurde, kannst du folgendes Kommando ausführen: 61Um PHPs eingebauten Server zu starten und zu testen, ob alles korrekt installiert wurde, kannst du folgendes Kommando ausführen:
61 62
diff --git a/docs/de/user/upgrade-2.0.x-2.0.y.rst b/docs/de/user/upgrade-2.0.x-2.0.y.rst
index adf288bd..5820a0d2 100644
--- a/docs/de/user/upgrade-2.0.x-2.0.y.rst
+++ b/docs/de/user/upgrade-2.0.x-2.0.y.rst
@@ -8,6 +8,7 @@ Das neueste Release ist auf https://www.wallabag.org/pages/download-wallabag.htm
8 8
9:: 9::
10 10
11 rm -rf var/cache/*
11 git fetch origin 12 git fetch origin
12 git fetch --tags 13 git fetch --tags
13 git checkout 2.0.8 14 git checkout 2.0.8
diff --git a/docs/de/user/upgrade-2.0.x-2.1.y.rst b/docs/de/user/upgrade-2.0.x-2.1.y.rst
index 23bf3682..7c20f4ee 100644
--- a/docs/de/user/upgrade-2.0.x-2.1.y.rst
+++ b/docs/de/user/upgrade-2.0.x-2.1.y.rst
@@ -11,6 +11,7 @@ Das neueste Release ist auf https://www.wallabag.org/pages/download-wallabag.htm
11 11
12:: 12::
13 13
14 rm -rf var/cache/*
14 git fetch origin 15 git fetch origin
15 git fetch --tags 16 git fetch --tags
16 git checkout 2.1.0 17 git checkout 2.1.0
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index 7954fe0b..82fa6f4e 100644
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@ -55,6 +55,7 @@ To install wallabag itself, you must run the following commands:
55 cd wallabag 55 cd wallabag
56 git checkout 2.1.0 56 git checkout 2.1.0
57 ASSETS=build ./install.sh 57 ASSETS=build ./install.sh
58 php bin/console wallabag:install --env=prod
58 59
59To start PHP's build-in server and test if everything did install correctly, you can do: 60To start PHP's build-in server and test if everything did install correctly, you can do:
60 61
diff --git a/docs/en/user/upgrade-2.0.x-2.0.y.rst b/docs/en/user/upgrade-2.0.x-2.0.y.rst
index 6a0818b3..3391c2cd 100644
--- a/docs/en/user/upgrade-2.0.x-2.0.y.rst
+++ b/docs/en/user/upgrade-2.0.x-2.0.y.rst
@@ -8,6 +8,7 @@ The last release is published on https://www.wallabag.org/pages/download-wallaba
8 8
9:: 9::
10 10
11 rm -rf var/cache/*
11 git fetch origin 12 git fetch origin
12 git fetch --tags 13 git fetch --tags
13 git checkout 2.0.8 14 git checkout 2.0.8
diff --git a/docs/en/user/upgrade-2.0.x-2.1.y.rst b/docs/en/user/upgrade-2.0.x-2.1.y.rst
index 63a77e7c..234045ba 100644
--- a/docs/en/user/upgrade-2.0.x-2.1.y.rst
+++ b/docs/en/user/upgrade-2.0.x-2.1.y.rst
@@ -11,6 +11,7 @@ The last release is published on https://www.wallabag.org/pages/download-wallaba
11 11
12:: 12::
13 13
14 rm -rf var/cache/*
14 git fetch origin 15 git fetch origin
15 git fetch --tags 16 git fetch --tags
16 git checkout 2.1.0 17 git checkout 2.1.0
diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst
index f9777890..bb4de534 100644
--- a/docs/fr/user/installation.rst
+++ b/docs/fr/user/installation.rst
@@ -53,6 +53,7 @@ Pour installer wallabag, vous devez exécuter ces commandes :
53 cd wallabag 53 cd wallabag
54 git checkout 2.1.0 54 git checkout 2.1.0
55 ASSETS=build ./install.sh 55 ASSETS=build ./install.sh
56 php bin/console wallabag:install --env=prod
56 57
57Pour démarrer le serveur interne à php et vérifier que tout s'est installé correctement, vous pouvez exécuter : 58Pour démarrer le serveur interne à php et vérifier que tout s'est installé correctement, vous pouvez exécuter :
58 59
diff --git a/docs/fr/user/upgrade-2.0.x-2.0.y.rst b/docs/fr/user/upgrade-2.0.x-2.0.y.rst
index d8dfac6e..8d8ad806 100644
--- a/docs/fr/user/upgrade-2.0.x-2.0.y.rst
+++ b/docs/fr/user/upgrade-2.0.x-2.0.y.rst
@@ -8,6 +8,7 @@ La dernière version de wallabag est publiée à cette adresse : https://www.wal
8 8
9:: 9::
10 10
11 rm -rf var/cache/*
11 git fetch origin 12 git fetch origin
12 git fetch --tags 13 git fetch --tags
13 git checkout 2.0.8 14 git checkout 2.0.8
diff --git a/docs/fr/user/upgrade-2.0.x-2.1.y.rst b/docs/fr/user/upgrade-2.0.x-2.1.y.rst
index dc66682a..fdd1f0cb 100644
--- a/docs/fr/user/upgrade-2.0.x-2.1.y.rst
+++ b/docs/fr/user/upgrade-2.0.x-2.1.y.rst
@@ -11,6 +11,7 @@ La dernière version de wallabag est publiée à cette adresse : https://www.wal
11 11
12:: 12::
13 13
14 rm -rf var/cache/*
14 git fetch origin 15 git fetch origin
15 git fetch --tags 16 git fetch --tags
16 git checkout 2.1.0 17 git checkout 2.1.0
diff --git a/install.sh b/install.sh
index 29b343b2..87d53bf0 100755
--- a/install.sh
+++ b/install.sh
@@ -1,15 +1,13 @@
1#! /usr/bin/env bash 1#! /usr/bin/env bash
2 2
3if [[ $ASSETS == 'build' ]]; then 3echo " > Installing PHP dependencies through Composer..."
4 echo "Installing PHP dependencies through Composer..." 4composer install --no-interaction --no-progress --prefer-dist -o --no-dev
5 composer install --no-interaction --no-progress --prefer-dist -o 5
6 6chmod ugo+x vendor/mouf/nodejs-installer/bin/local/npm
7 chmod ugo+x vendor/mouf/nodejs-installer/bin/local/npm 7echo " > Downloading librairies through npm..."
8 echo "Downloading librairies through npm..." 8vendor/mouf/nodejs-installer/bin/local/npm install
9 vendor/mouf/nodejs-installer/bin/local/npm install 9
10 10echo " > Concat, minify and installing assets..."
11 echo "Concat, minify and installing assets..." 11node_modules/grunt/bin/grunt
12 node_modules/grunt/bin/grunt 12
13else 13echo " > Install finished"
14 composer install --no-interaction --no-progress --prefer-dist -o
15fi
diff --git a/install_dev.sh b/install_dev.sh
index 61a4f6fd..cbd47495 100755
--- a/install_dev.sh
+++ b/install_dev.sh
@@ -1,13 +1,14 @@
1#! /usr/bin/env bash 1#! /usr/bin/env bash
2 2
3echo "Installing PHP dependencies (including dev) through Composer..." 3echo " > Installing PHP dependencies (including dev) through Composer..."
4composer install 4composer install -o --no-interaction --no-progress --prefer-dist
5 5
6echo "Downloading librairies through npm..." 6if [[ $ASSETS == 'build' || $TRAVIS_BUILD_DIR == '' ]]; then
7npm install 7 echo " > Downloading librairies through npm..."
8 npm install
8 9
9echo "Concat, minify and installing assets..." 10 echo " > Concat, minify and installing assets..."
10grunt 11 grunt
12fi
11 13
12echo "Installing wallabag..." 14echo " > Install finished"
13php bin/console wallabag:install