plugins/gif: use `type -p`

pull/2014/head
John D Pell 2021-09-11 18:04:53 -07:00
parent b846c86dbb
commit b1b08de626
1 changed files with 7 additions and 6 deletions

View File

@ -1,3 +1,4 @@
# shellcheck shell=bash
cite about-plugin cite about-plugin
about-plugin 'video to gif, gif to WebM helper functions' about-plugin 'video to gif, gif to WebM helper functions'
@ -30,11 +31,11 @@ function v2gif {
example '$ v2gif -dh *.avi' example '$ v2gif -dh *.avi'
example '$ v2gif -thw 600 *.avi *.mov' example '$ v2gif -thw 600 *.avi *.mov'
local convert=$(which convert) ; [[ -x "$convert" ]] || { echo "No convert found!" ; return 2 ;} local convert="$(type -p convert)" ; [[ -x "$convert" ]] || { echo "No convert found!" ; return 2 ;}
local ffmpeg=$(which ffmpeg) ; [[ -x "$ffmpeg" ]] || { echo "No ffmpeg found!" ; return 2 ;} local ffmpeg="$(type -p ffmpeg)" ; [[ -x "$ffmpeg" ]] || { echo "No ffmpeg found!" ; return 2 ;}
local mediainfo=$(which mediainfo) ; [[ -x "$mediainfo" ]] || { echo "No mediainfo found!" ; return 2 ;} local mediainfo="$(type -p mediainfo)" ; [[ -x "$mediainfo" ]] || { echo "No mediainfo found!" ; return 2 ;}
local gifsicle=$(which gifsicle) ; [[ -x "$gifsicle" ]] || { echo "No gifsicle found!" ; return 2 ;} local gifsicle="$(type -p gifsicle)" ; [[ -x "$gifsicle" ]] || { echo "No gifsicle found!" ; return 2 ;}
local getopt=$(which getopt) local getopt="$(type -p getopt)"
if [[ "$OSTYPE" == "darwin"* ]] ; then if [[ "$OSTYPE" == "darwin"* ]] ; then
# Getopt on BSD is incompatible with GNU # Getopt on BSD is incompatible with GNU
@ -77,7 +78,7 @@ function v2gif {
;; ;;
-h|--high) -h|--high)
#High Quality, use gifski #High Quality, use gifski
local gifski=$(which gifski) ; [[ -x "$gifski" ]] || { echo "No gifski found!" ; return 2 ; } local gifski="$(type -p gifski)" ; [[ -x "$gifski" ]] || { echo "No gifski found!" ; return 2 ; }
use_gifski=true use_gifski=true
giftag="${giftag}-h" giftag="${giftag}-h"
shift shift