From d6f4ef6d85cee1cc7f48fc1fdeb06c9a6af40c9f Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Wed, 3 Dec 2014 20:12:14 +0200
Subject: [PATCH] tvheadend: simplify tv_grab_file

and meh --quiet. closes #3661
---
 .../multimedia/tvheadend/changelog.txt        |  4 ++
 .../service/multimedia/tvheadend/package.mk   |  2 +-
 .../tvheadend/source/bin/tv_grab_file         | 64 +++----------------
 3 files changed, 14 insertions(+), 56 deletions(-)

diff --git a/packages/addons/service/multimedia/tvheadend/changelog.txt b/packages/addons/service/multimedia/tvheadend/changelog.txt
index ed635d34c9..14503e0cca 100644
--- a/packages/addons/service/multimedia/tvheadend/changelog.txt
+++ b/packages/addons/service/multimedia/tvheadend/changelog.txt
@@ -1,3 +1,7 @@
+4.3.6
+- fix tv_grab_file with --quiet (again!)
+- fix crash on imx6
+
 4.3.5
 - fix crash on imx6
 
diff --git a/packages/addons/service/multimedia/tvheadend/package.mk b/packages/addons/service/multimedia/tvheadend/package.mk
index 9cdc94c077..5340ed814e 100644
--- a/packages/addons/service/multimedia/tvheadend/package.mk
+++ b/packages/addons/service/multimedia/tvheadend/package.mk
@@ -18,7 +18,7 @@
 
 PKG_NAME="tvheadend"
 PKG_VERSION="3.9.2182"
-PKG_REV="5"
+PKG_REV="6"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.tvheadend.org"
diff --git a/packages/addons/service/multimedia/tvheadend/source/bin/tv_grab_file b/packages/addons/service/multimedia/tvheadend/source/bin/tv_grab_file
index 9ca278013f..bcd95ea06c 100755
--- a/packages/addons/service/multimedia/tvheadend/source/bin/tv_grab_file
+++ b/packages/addons/service/multimedia/tvheadend/source/bin/tv_grab_file
@@ -27,60 +27,14 @@ XMLTV_LOCATION_FILE=`grep XMLTV_LOCATION_FILE $ADDON_SETTINGS | awk '{print $3 }
 XMLTV_LOCATION_WEB=`grep XMLTV_LOCATION_WEB $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
 XMLTV_LOCATION_SCRIPT=`grep XMLTV_LOCATION_SCRIPT $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
 
-dflag=
-vflag=
-cflag=
-
-if [[ $# -lt 1 ]]; then
-  if [ "$XMLTV_TYPE" = "FILE" ]; then
-    cat "$XMLTV_LOCATION_FILE"
-    exit 0
-  elif [ "$XMLTV_TYPE" = "SCRIPT" ]; then
-    if [ -e "$XMLTV_LOCATION_SCRIPT" ] ; then
-      exec "$XMLTV_LOCATION_SCRIPT"
-    fi
-  elif [ "$XMLTV_TYPE" = "WEB" ]; then
-    wget -qO - "$XMLTV_LOCATION_WEB"
-    exit 0
+if [ "$XMLTV_TYPE" = "FILE" ]; then
+  cat "$XMLTV_LOCATION_FILE"
+  exit 0
+elif [ "$XMLTV_TYPE" = "SCRIPT" ]; then
+  if [ -e "$XMLTV_LOCATION_SCRIPT" ] ; then
+    exec "$XMLTV_LOCATION_SCRIPT"
   fi
-fi
-
-for arg; do
-    delim=""
-    case "$arg" in
-    #translate --gnu-long-options to -g (short options)
-       --description) args="${args}-d ";;
-       --version) args="${args}-v ";;
-       --capabilities) args="${args}-c ";;
-       --quiet) args="${args}-q ";;
-       #pass through anything else
-       *) [[ "${arg:0:1}" == "-" ]] || delim="\""
-           args="${args}${delim}${arg}${delim} ";;
-    esac
-done
-
-#Reset the positional parameters to the short options
-eval set -- $args
-
-while getopts "dvcq" option; do
-    case $option in
-        d)  dflag=1;;
-        v)  vflag=1;;
-        c)  cflag=1;;
-        q) ;;
-        \?) printf "unknown option: -%s\n" $OPTARG
-            printf "Usage: %s: [--description] [--version] [--capabilities] \n" $(basename $0)
-            exit 2
-            ;;
-    esac >&2
-done
-
-if [ "$dflag" ]; then
-   printf "tv_grab_file is a simple grabber that just read the local or web XMLTV formated file\n"
-fi
-if [ "$vflag" ]; then
-   printf "0.1\n"
-fi
-if [ "$cflag" ]; then
-   printf "baseline\n"
+elif [ "$XMLTV_TYPE" = "WEB" ]; then
+  wget -qO - "$XMLTV_LOCATION_WEB"
+  exit 0
 fi