]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
support: re-instate getmuxlist script to ensure pbuilder script works
authorAdam Sutton <dev@adamsutton.me.uk>
Thu, 31 Jan 2013 11:53:15 +0000 (11:53 +0000)
committerAdam Sutton <dev@adamsutton.me.uk>
Thu, 31 Jan 2013 12:16:04 +0000 (12:16 +0000)
configure
support/getmuxlist [new file with mode: 0755]

index e9bc7e4e7c3c1b11d4093ed31527bc3a8fee5537..1b618cea1e565646230f4e223cd2ef02854b2e5c 100755 (executable)
--- a/configure
+++ b/configure
@@ -175,16 +175,10 @@ fi
 #
 if enabled linuxdvb && enabled dvbscan; then
   printf "${TAB}" "fetching dvb-scan files ..."
-  if [ -d ${ROOTDIR}/data/dvb-scan/.git ]; then
-    (cd ${ROOTDIR}/data/dvb-scan; git pull) &> /dev/null
-  else
-    rm -rf ${ROOTDIR}/data/dvb-scan &> /dev/null
-    URL=git://linuxtv.org/dtv-scan-tables.git
-    git clone $URL ${ROOTDIR}/data/dvb-scan &> /dev/null
-    if [ $? -ne 0 ]; then
-      echo "fail"
-      die "Failed to fetch dvb-scan data (use --disable-dvbscan)"
-    fi
+  ${ROOTDIR}/support/getmuxlist
+  if [ $? -ne 0 ]; then
+    echo "fail"
+    die "Failed to fetch dvb-scan data (use --disable-dvbscan)"
   fi
   echo "ok"
 fi
diff --git a/support/getmuxlist b/support/getmuxlist
new file mode 100755 (executable)
index 0000000..f115f87
--- /dev/null
@@ -0,0 +1,19 @@
+#!/bin/bash
+#
+# Fetch DVB scan files
+#
+
+# Arguments
+DIR=$1
+[ -z "$DIR" ] && DIR=$(dirname $0)/../data/dvb-scan
+
+# Update
+if [ -d ${DIR}/.git ]; then
+  (cd ${DIR}; git pull) &> /dev/null
+
+# Fetch
+else
+  rm -rf ${DIR} &> /dev/null
+  URL=git://linuxtv.org/dtv-scan-tables.git
+  git clone $URL ${DIR} &> /dev/null
+fi