scripts: Call utilities via environment variables.

diff --git a/dvdrip b/dvdrip
index 734b00fb70ae5fe01db7edc7f75326cb2757b533..8173906e43fccd905cbe1cbec704f95b8d57cde9 100755 (executable)
--- a/dvdrip
+++ b/dvdrip
@@ -5,6 +5,7 @@ dev=${DVDRIP_DEVICE-/dev/dvd}
 tmp=${DVDRIP_TMPDIR-${HOME?}/tmp/dvdrip}
 archive=${DVDRIP_ARCHIVE-jem.distorted.org.uk:/mnt/dvd/archive}
 : ${DVD_SECTOR_COPY=dvd-sector-copy}
 tmp=${DVDRIP_TMPDIR-${HOME?}/tmp/dvdrip}
 archive=${DVDRIP_ARCHIVE-jem.distorted.org.uk:/mnt/dvd/archive}
 : ${DVD_SECTOR_COPY=dvd-sector-copy}

+: ${DVD_ID=dvd-id}

 : ${DVDRIP_UPLOAD=dvdrip-upload}
 backup=nil ding=nil eject=nil force=nil retry=nil verbose=nil bogus=nil
 unset params
 : ${DVDRIP_UPLOAD=dvdrip-upload}
 backup=nil ding=nil eject=nil force=nil retry=nil verbose=nil bogus=nil
 unset params


@@ -77,7 +78,7 @@ esac
 
 mkdir -p "$tmp/$tag"
 
 
 mkdir -p "$tmp/$tag"
 

-discid=$(dvd-id "$dev")
+discid=$("$DVD_ID" "$dev")

 if [ -f "$tmp/$tag/discid" ]; then
   read oldid <"$tmp/$tag/discid"
   case $force,$oldid in
 if [ -f "$tmp/$tag/discid" ]; then
   read oldid <"$tmp/$tag/discid"
   case $force,$oldid in

diff --git a/dvdrip-check-batch b/dvdrip-check-batch
index f0f8d37a1d84491d35b75ed3751ff4574470b9c5..1f8849b46fadc708de5a6399b77cdfd444adb187 100755 (executable)
--- a/dvdrip-check-batch
+++ b/dvdrip-check-batch
@@ -1,6 +1,7 @@
 #! /bin/bash -e
 
 prog=${0##*/}
 #! /bin/bash -e
 
 prog=${0##*/}

+: ${DVD_CHECK_KEYS=dvd-check-keys}

 bogus=nil
 usage () {
   cat <<EOF
 bogus=nil
 usage () {
   cat <<EOF


@@ -24,7 +25,7 @@ DVDCSS_CACHE=off; export DVDCSS_CACHE
 find "$@" -type f -name "*.iso" | sort | while IFS= read -r iso; do
   echo -n "check $iso..."
   retry=${iso%.iso}.retry
 find "$@" -type f -name "*.iso" | sort | while IFS= read -r iso; do
   echo -n "check $iso..."
   retry=${iso%.iso}.retry

-  set +e; dvd-check-keys -b"$retry.new" "$iso"; rc=$?; set -e
+  set +e; ${DVD_CHECK_KEYS} -b"$retry.new" "$iso"; rc=$?; set -e

   case $rc in
     0) rm -f "$retry" echo " ${green}ok${plain}" ;;
     1) mv "$retry.new" "$retry"; echo " ${red}FAILED${plain}" ;;
   case $rc in
     0) rm -f "$retry" echo " ${green}ok${plain}" ;;
     1) mv "$retry.new" "$retry"; echo " ${red}FAILED${plain}" ;;

diff --git a/dvdrip-retry-botched-vobs b/dvdrip-retry-botched-vobs
index 32fd9887310d8b73fc9b5e65d802cba0871174df..0a171f3a10d54fd96ecd281e7513c4922b95bb74 100755 (executable)
--- a/dvdrip-retry-botched-vobs
+++ b/dvdrip-retry-botched-vobs
@@ -1,6 +1,8 @@
 #! /bin/sh -e
 
 dev=${DVDRIP_DEVICE-/dev/dvd}
 #! /bin/sh -e
 
 dev=${DVDRIP_DEVICE-/dev/dvd}

+: ${DVD_SECTOR_COPY=dvd-sector-copy}
+: ${DVD_CHECK_KEYS=dvd-check-keys}

 
 find "$@" -type f -name "*.retry" -print | sort | while IFS= read -r r; do
   iso=${r%.retry}.iso
 
 find "$@" -type f -name "*.retry" -print | sort | while IFS= read -r r; do
   iso=${r%.retry}.iso


@@ -23,9 +25,9 @@ find "$@" -type f -name "*.retry" -print | sort | while IFS= read -r r; do
   done
 
   for try in 3 2 1 0; do
   done
 
   for try in 3 2 1 0; do

-    dvd-sector-copy -R"$r" "$dev" "$iso"
+    "$DVD_SECTOR_COPY" -R"$r" "$dev" "$iso"

 
 

-    set +e; DVDCSS_CACHE=off dvd-check-keys -b"$r.new" "$dev"; rc=$?; set -e
+    set +e; DVDCSS_CACHE=off "$DVD_CHECK_KEYS" -b"$r.new" "$dev"; rc=$?; set -e

     case $rc,$try in
       0,*) rm -f "$r"; break ;;
       1,0) echo "Giving up :-("; mv "$r.new" "$r"; break ;;
     case $rc,$try in
       0,*) rm -f "$r"; break ;;
       1,0) echo "Giving up :-("; mv "$r.new" "$r"; break ;;