From 62a0591d783d30f22099b6118e5537e34d421f99 Mon Sep 17 00:00:00 2001
From: Pierre Rudloff <contact@rudloff.pro>
Date: Sun, 17 May 2015 22:08:53 +0200
Subject: [PATCH] Improve ffmpeg install script

---
 config.example.php | 2 +-
 ffmpeg/.gitignore  | 2 ++
 package.json       | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 ffmpeg/.gitignore

diff --git a/config.example.php b/config.example.php
index 6bfd314..8baf6e8 100644
--- a/config.example.php
+++ b/config.example.php
@@ -19,7 +19,7 @@ if (getenv('CONVERT')) {
 } else {
     define('CONVERT', false);
 }
-define('AVCONV', __DIR__.'/ffmpeg-2.6.2-64bit-static/ffmpeg');
+define('AVCONV', __DIR__.'/ffmpeg/ffmpeg');
 define('MAINTENANCE', false);
 define('DISABLED', false);
 define('BASE_URL', 'http://alltubedownload.net/');
diff --git a/ffmpeg/.gitignore b/ffmpeg/.gitignore
new file mode 100644
index 0000000..d6b7ef3
--- /dev/null
+++ b/ffmpeg/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/package.json b/package.json
index 06fc75d..895d531 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,6 @@
         "url": "https://github.com/Rudloff/alltube.git"
     },
     "scripts": {
-        "postinstall": "./node_modules/grunt-cli/bin/grunt; curl https://yt-dl.org/downloads/2015.04.09/youtube-dl -o youtube-dl; curl http://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz -o ffmpeg.tar.xz; tar xJf ffmpeg.tar.xz"
+        "postinstall": "./node_modules/grunt-cli/bin/grunt; curl https://yt-dl.org/downloads/2015.04.09/youtube-dl -o youtube-dl; 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"
     }
 }