From 7a52ff434c8287d0f1a68d709cb41d0c4678c737 Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Thu, 31 Jan 2013 11:53:15 +0000 Subject: [PATCH] support: re-instate getmuxlist script to ensure pbuilder script works --- configure | 14 ++++---------- support/getmuxlist | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 10 deletions(-) create mode 100755 support/getmuxlist diff --git a/configure b/configure index e9bc7e4e7c..1b618cea1e 100755 --- 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 index 0000000000..f115f87118 --- /dev/null +++ b/support/getmuxlist @@ -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