Merge branch 'release-0.4.2'

Rudloff · Nov 21, 2015 · 3f06b82 · 3f06b82
2 parents d26cc2f + 6205dd5
commit 3f06b82
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,3 +2,5 @@ language: php
 install:
     - composer install
     - npm install
+before_install:
+    - composer selfupdate
diff --git a/classes/Config.php b/classes/Config.php
@@ -31,7 +31,7 @@
     public $python = '/usr/bin/python';
     public $params = '--no-playlist --no-warnings -f best';
     public $convert = false;
-    public $avconv = 'ffmpeg/ffmpeg';
+    public $avconv = 'vendor/bin/ffmpeg';
 
     /**
      * Config constructor

diff --git a/composer.json b/composer.json
@@ -10,7 +10,8 @@
         "slim/slim": "~2.6.2",
         "slim/views": "~0.1.3",
         "rudloff/smarty-plugin-noscheme": "~0.1.0",
-        "symfony/yaml": "~2.7.6"
+        "symfony/yaml": "~2.7.6",
+        "ffmpeg/ffmpeg": "~2.8.2"
     },
     "require-dev": {
         "symfony/var-dumper": "~2.7.6"
@@ -34,6 +35,20 @@
                     "reference": "2015.11.13"
                 }
             }
+        },
+        {
+            "type": "package",
+            "package": {
+                "name": "ffmpeg/ffmpeg",
+                "version": "2.8.2",
+                "dist": {
+                    "url": "http://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz",
+                    "type": "xz"
+                },
+                "bin": [
+                    "ffmpeg"
+                ]
+            }
         }
     ],
     "authors": [

diff --git a/composer.lock b/composer.lock
diff --git a/config.example.yml b/config.example.yml
@@ -2,4 +2,4 @@ youtubedl: vendor/rg3/youtube-dl/youtube_dl/__main__.py
 python: /usr/bin/python
 params: --no-playlist --no-warnings -f best
 convert: false
-avconv: ffmpeg/ffmpeg
+avconv: vendor/bin/ffmpeg
diff --git a/ffmpeg/.gitignore b/ffmpeg/.gitignore
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "alltube",
-    "version": "0.4.1",
+    "version": "0.4.2",
     "dependencies": {
         "grunt": "~0.4.5",
         "grunt-cli": "~0.1.13",
@@ -20,6 +20,6 @@
         "url": "https://github.com/Rudloff/alltube.git"
     },
     "scripts": {
-        "postinstall": "./node_modules/bower/bin/bower install; ./node_modules/grunt-cli/bin/grunt; curl http://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz -o ffmpeg.tar.xz; tar xJf ffmpeg.tar.xz -C ffmpeg --strip-components=1"
+        "postinstall": "./node_modules/bower/bin/bower install; ./node_modules/grunt-cli/bin/grunt"
     }
 }