From 3290ac4185f24329f28270492b61e00b850b0e11 Mon Sep 17 00:00:00 2001 From: evazion Date: Tue, 3 Sep 2019 00:34:40 -0500 Subject: [PATCH] ugoiras: fix ffmpeg/mkvmerge check. The -p option is nonstandard and isn't supported by dash, the /bin/sh on Debian, so the check failed on Debian. --- app/logical/pixiv_ugoira_converter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/logical/pixiv_ugoira_converter.rb b/app/logical/pixiv_ugoira_converter.rb index 65cc16cf3..ecf30e3e4 100644 --- a/app/logical/pixiv_ugoira_converter.rb +++ b/app/logical/pixiv_ugoira_converter.rb @@ -1,6 +1,6 @@ class PixivUgoiraConverter def self.enabled? - system("type -p ffmpeg > /dev/null") && system("type -p mkvmerge > /dev/null") + system("ffmpeg -version > /dev/null") && system("mkvmerge --version > /dev/null") end def self.generate_webm(ugoira_file, frame_data)