From 8d43248794b1abadf6e1c519b79a05bd5e64467c Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 21 Feb 2020 22:33:23 +0100 Subject: [PATCH] w_scan: fix country and satalite selection menu Signed-off-by: Arne Fitzenreiter --- config/w_scan/w_scan_start | 13 +++++++------ lfs/w_scan | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/config/w_scan/w_scan_start b/config/w_scan/w_scan_start index c424f5f14d..26527b41af 100755 --- a/config/w_scan/w_scan_start +++ b/config/w_scan/w_scan_start @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team # +# Copyright (C) 2007-2020 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -19,9 +19,10 @@ # # ############################################################################### ############################################################################### -# w_scan_start for IPFire v 1.02 - 2013-04-30 Arne Fitzenreiter - add atsc # -# - 2013-04-20 Arne Fitzenreiter - path vdr 2 # -# - 2012-11-15 Arne Fitzenreiter - inital vers.# +# w_scan_start - 2020-02-21 Arne Fitzenreiter - update for 2017 wscan version # +# - 2013-04-30 Arne Fitzenreiter - add atsc # +# - 2013-04-20 Arne Fitzenreiter - path vdr 2 # +# - 2012-11-15 Arne Fitzenreiter - inital vers. # ############################################################################### err_msg () @@ -82,7 +83,7 @@ if [[ "$W_SCAN_TYPE" == *ATSC* ]] || [[ "$W_SCAN_TYPE" == *DVB-T* ]] || [[ "$W_S # Generate and run separate country menubox and default germany echo '#!/bin/bash' > /tmp/w_scan_countryselect.sh echo 'whiptail --radiolist "\nSelect country" 19 70 10 \' >> /tmp/w_scan_countryselect.sh - $WSCAN -c? 2>&1 | cut -f2,4 | sed 's|[ ]| "|g' | sed 's|$|" off \\|g' | sed 's|"GERMANY" off |"GERMANY" on |g' >> /tmp/w_scan_countryselect.sh + $WSCAN -c? 2>&1 | tail -n +2 | cut -f2,4 | sed 's|[ ]| "|g' | sed 's|$|" off \\|g' | sed 's|"GERMANY" off |"GERMANY" on |g' >> /tmp/w_scan_countryselect.sh echo ' 2>/tmp/w_scan_country' >> /tmp/w_scan_countryselect.sh sh /tmp/w_scan_countryselect.sh chk_cancel @@ -95,7 +96,7 @@ if [[ "$W_SCAN_TYPE" == *DVB-S* ]]; then # Generate and run separate satelite menubox and default astra echo '#!/bin/bash' > /tmp/w_scan_satselect.sh echo 'whiptail --checklist "\nSelect satellites" 19 70 10 \' >> /tmp/w_scan_satselect.sh - $WSCAN -s? 2>&1 | cut -f2,4 | sed 's|[ ]| "|g' | sed 's|$|" off \\|g' | sed 's|19.2 east.*|19.2 east Astra 1F/1G/1H/1KR/1L" on \\|g' >> /tmp/w_scan_satselect.sh + $WSCAN -s? 2>&1 | tail -n +2 | cut -f2,4 | sed 's|[ ]| "|g' | sed 's|$|" off \\|g' | sed 's|19.2 east.*|19.2 east Astra 1F/1G/1H/1KR/1L" on \\|g' >> /tmp/w_scan_satselect.sh echo ' 2>/tmp/w_scan_satellite' >> /tmp/w_scan_satselect.sh sh /tmp/w_scan_satselect.sh chk_cancel diff --git a/lfs/w_scan b/lfs/w_scan index ecc196845c..4b5229c3ed 100644 --- a/lfs/w_scan +++ b/lfs/w_scan @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2020 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = w_scan -PAK_VER = 6 +PAK_VER = 7 DEPS = "" -- 2.39.5