From f71321c24ac484c487b29b025cc5c33c1860a074 Mon Sep 17 00:00:00 2001 From: echel0n Date: Sun, 20 Apr 2014 20:50:47 -0700 Subject: [PATCH] Fixed a typo --- nzbtomedia/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nzbtomedia/__init__.py b/nzbtomedia/__init__.py index 445fad61..bf674444 100644 --- a/nzbtomedia/__init__.py +++ b/nzbtomedia/__init__.py @@ -280,15 +280,15 @@ def initialize(section=None): else: bitbucket = open('/dev/null') - FFMPEG = subprocess.Popen(['which', 'ffmpeg'], stdout=subprocess.PIPE).communicate()[0] - FFPROBE = subprocess.Popen(['which', 'ffprobe'], stdout=subprocess.PIPE).communicate()[0] + FFMPEG = subprocess.Popen(['which', 'ffmpeg'], stdout=subprocess.PIPE).communicate()[0].strip() + FFPROBE = subprocess.Popen(['which', 'ffprobe'], stdout=subprocess.PIPE).communicate()[0].strip() if not (FFMPEG or FFPROBE): # Auto-install FFMPEG and FFPROBE res = subprocess.call([joinPath(PROGRAM_DIR, 'getffmpeg.sh')], stdout=bitbucket, stderr=bitbucket) if res == 0: - FFMPEG = subprocess.Popen(['which', 'ffmpeg'], stdout=subprocess.PIPE).communicate()[0] - FFPROBE = subprocess.Popen(['which', 'ffprobe'], stdout=subprocess.PIPE).communicate()[0] + FFMPEG = subprocess.Popen(['which', 'ffmpeg'], stdout=subprocess.PIPE).communicate()[0].strip() + FFPROBE = subprocess.Popen(['which', 'ffprobe'], stdout=subprocess.PIPE).communicate()[0].strip() else: logger.error("Failed to install ffmpeg. Please install manually") FFMPEG = None