diff options
-rw-r--r-- | .bowerrc | 4 | ||||
-rw-r--r-- | bower.json | 39 | ||||
-rwxr-xr-x | install.sh | 5 | ||||
-rwxr-xr-x | install_dev.sh | 5 |
4 files changed, 2 insertions, 51 deletions
diff --git a/.bowerrc b/.bowerrc deleted file mode 100644 index e0163687..00000000 --- a/.bowerrc +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | { | ||
2 | "directory" : "app/Resources/static/lib", | ||
3 | "json" : "bower.json" | ||
4 | } | ||
diff --git a/bower.json b/bower.json deleted file mode 100644 index f2d2bd26..00000000 --- a/bower.json +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | { | ||
2 | "name": "wallabag", | ||
3 | "version": "2.0.0-beta.1", | ||
4 | "homepage": "https://github.com/wallabag/wallabag", | ||
5 | "authors": [ | ||
6 | { | ||
7 | "name": "Nicolas Lœuillet", | ||
8 | "email": "nicolas@loeuillet.org", | ||
9 | "homepage": "http://www.cdetc.fr", | ||
10 | "role": "Developer" | ||
11 | }, | ||
12 | { | ||
13 | "name": "Thomas Citharel", | ||
14 | "homepage": "http://tcit.fr", | ||
15 | "role": "Developer" | ||
16 | }, | ||
17 | { | ||
18 | "name": "Jérémy Benoist", | ||
19 | "homepage": "http://www.j0k3r.net", | ||
20 | "role": "Developer" | ||
21 | } | ||
22 | ], | ||
23 | "description": "wallabag is a self hostable application for saving web pages", | ||
24 | "license": "MIT", | ||
25 | "main": "bower.json", | ||
26 | "ignore": [ | ||
27 | "**/.*", | ||
28 | "node_modules", | ||
29 | "bower_components", | ||
30 | "test", | ||
31 | "tests" | ||
32 | ], | ||
33 | "dependencies": { | ||
34 | "icomoon-bower": "^0.1.0", | ||
35 | "bower-pt-sans": "pt-sans#*", | ||
36 | "roboto-fontface": "^0.4.5", | ||
37 | "material-design-icons-iconfont": "^2.0.4" | ||
38 | } | ||
39 | } | ||
@@ -5,12 +5,9 @@ if [[ $ASSETS == 'build' ]]; then | |||
5 | composer install --no-interaction --no-progress --prefer-dist -o | 5 | composer install --no-interaction --no-progress --prefer-dist -o |
6 | 6 | ||
7 | chmod ugo+x vendor/mouf/nodejs-installer/bin/local/npm | 7 | chmod ugo+x vendor/mouf/nodejs-installer/bin/local/npm |
8 | echo "Downloading javascript librairies through npm..." | 8 | echo "Downloading librairies through npm..." |
9 | vendor/mouf/nodejs-installer/bin/local/npm install | 9 | vendor/mouf/nodejs-installer/bin/local/npm install |
10 | 10 | ||
11 | echo "Downloading fonts librairies through bower..." | ||
12 | node_modules/bower/bin/bower install | ||
13 | |||
14 | echo "Concat, minify and installing assets..." | 11 | echo "Concat, minify and installing assets..." |
15 | node_modules/grunt/bin/grunt | 12 | node_modules/grunt/bin/grunt |
16 | else | 13 | else |
diff --git a/install_dev.sh b/install_dev.sh index 81f871da..61a4f6fd 100755 --- a/install_dev.sh +++ b/install_dev.sh | |||
@@ -3,12 +3,9 @@ | |||
3 | echo "Installing PHP dependencies (including dev) through Composer..." | 3 | echo "Installing PHP dependencies (including dev) through Composer..." |
4 | composer install | 4 | composer install |
5 | 5 | ||
6 | echo "Downloading javascript librairies through npm..." | 6 | echo "Downloading librairies through npm..." |
7 | npm install | 7 | npm install |
8 | 8 | ||
9 | echo "Downloading fonts librairies through bower..." | ||
10 | bower install | ||
11 | |||
12 | echo "Concat, minify and installing assets..." | 9 | echo "Concat, minify and installing assets..." |
13 | grunt | 10 | grunt |
14 | 11 | ||