From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 14/14] Drop w_scan
Date: Wed, 12 Feb 2020 09:34:53 +0000 [thread overview]
Message-ID: <20200212093453.5732-15-michael.tremer@ipfire.org> (raw)
In-Reply-To: <20200212093453.5732-1-michael.tremer@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 10949 bytes --]
This package is useless without VDR.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/rootfiles/packages/w_scan | 3 -
config/w_scan/w_scan_start | 148 -------------------------------
lfs/w_scan | 86 ------------------
make.sh | 1 -
4 files changed, 238 deletions(-)
delete mode 100644 config/rootfiles/packages/w_scan
delete mode 100755 config/w_scan/w_scan_start
delete mode 100644 lfs/w_scan
diff --git a/config/rootfiles/packages/w_scan b/config/rootfiles/packages/w_scan
deleted file mode 100644
index b0744c261..000000000
--- a/config/rootfiles/packages/w_scan
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin/w_scan
-usr/bin/w_scan_start
-#usr/share/man/man1/w_scan.1
diff --git a/config/w_scan/w_scan_start b/config/w_scan/w_scan_start
deleted file mode 100755
index c424f5f14..000000000
--- a/config/w_scan/w_scan_start
+++ /dev/null
@@ -1,148 +0,0 @@
-#!/bin/bash
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> #
-# #
-# 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 #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-###############################################################################
-# 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.#
-###############################################################################
-
-err_msg ()
-{
- whiptail --msgbox "$1" 8 70 --title "Error"
- clear
- exit 1
-}
-
-chk_cancel ()
-{
- if [ ! "${?}" == 0 ];then
- clear
- echo "Terminated by user!"
- exit 0
- fi
-}
-
-yes_no ()
-{
- whiptail --yesno "$1" 8 70
- chk_cancel
-}
-
-WSCAN=$(which w_scan)
-
-# Whiptail does not like en_US.UTF-8
-LANG=c
-
-# Some initial checks...
-if [ -z $WSCAN ];then
- err_msg "w_scan not found!";
-fi
-if [ ! -e /dev/dvb/adapter[0-9]/frontend[0-9] ];then
- err_msg "No dvb tuner frontend found!";
-fi
-
-# Is vdr running?
-if [ "$(ps -A | grep " runvdr$")" != "" ] ;then
- yes_no "VDR is running. Cannot scan with active VDR. Should I stop it?"
- clear
- /etc/init.d/vdr stop
-fi
-
-# Select system type
-whiptail --checklist "\nSelect system type" 12 40 5 \
- DVB-T "Terrestrial" yes \
- DVB-C "Cable" no \
- DVB-S "Satellite" no \
- ATSC-T "Terrestrial" no \
- ATSC-C "Cable" no \
- 2>/tmp/w_scan_type
-chk_cancel
-W_SCAN_TYPE=$(cat /tmp/w_scan_type)
-rm /tmp/w_scan_type
-
-if [[ "$W_SCAN_TYPE" == *ATSC* ]] || [[ "$W_SCAN_TYPE" == *DVB-T* ]] || [[ "$W_SCAN_TYPE" == *DVB-C* ]]; then
- # 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
- echo ' 2>/tmp/w_scan_country' >> /tmp/w_scan_countryselect.sh
- sh /tmp/w_scan_countryselect.sh
- chk_cancel
- rm /tmp/w_scan_countryselect.sh
- W_SCAN_COUNTRY=$(cat /tmp/w_scan_country)
- rm /tmp/w_scan_country
-fi
-
-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
- echo ' 2>/tmp/w_scan_satellite' >> /tmp/w_scan_satselect.sh
- sh /tmp/w_scan_satselect.sh
- chk_cancel
- rm /tmp/w_scan_satselect.sh
- W_SCAN_SATELLITE=$(cat /tmp/w_scan_satellite | sed 's|"||g')
- rm /tmp/w_scan_satellite
-fi
-
-# Now start the scan ...
-clear
-rm -rf /tmp/channels.conf
-if [[ "$W_SCAN_TYPE" == *DVB-T* ]]; then
- echo ":->W-SCAN DVB-T $(date +%Y%m%d%H%M)" >>/tmp/channels.conf
- $WSCAN -f t -c $W_SCAN_COUNTRY -C UTF-8 -o 2 >>/tmp/channels.conf
-fi
-if [[ "$W_SCAN_TYPE" == *DVB-C* ]]; then
- echo ":->W-SCAN DVB-C $(date +%Y%m%d%H%M)" >>/tmp/channels.conf
- $WSCAN -f c -c $W_SCAN_COUNTRY -C UTF-8 -o 2 >>/tmp/channels.conf
-fi
-if [[ "$W_SCAN_TYPE" == *DVB-S* ]]; then
- for SATELLITE in $W_SCAN_SATELLITE;
- do
- echo ":->W-SCAN DVB-S $SATELLITE $(date +%Y%m%d%H%M)" >>/tmp/channels.conf
- $WSCAN -f s -s $SATELLITE -C UTF-8 -o 2 >>/tmp/channels.conf
- done
-fi
-if [[ "$W_SCAN_TYPE" == *ATSC-T* ]]; then
- echo ":->W-SCAN ATSC-T $(date +%Y%m%d%H%M)" >>/tmp/channels.conf
- $WSCAN -f a -A 1 -c $W_SCAN_COUNTRY -C UTF-8 -o 2 >>/tmp/channels.conf
-fi
-if [[ "$W_SCAN_TYPE" == *ATSC-C* ]]; then
- echo ":->W-SCAN ATSC-C $(date +%Y%m%d%H%M)" >>/tmp/channels.conf
- $WSCAN -f a -A 2 -c $W_SCAN_COUNTRY -C UTF-8 -o 2 >>/tmp/channels.conf
-fi
-
-# Save result to current dir.
-cp /tmp/channels.conf w_scan-$(date +%Y%m%d%H%M).channels.conf
-echo Results saved to w_scan-$(date +%Y%m%d%H%M).channels.conf
-
-# Do this only if vdr is installed ...
-if [ -e /opt/pakfire/db/installed/meta-vdr ]; then
- yes_no "Install new channels-conf for VDR."
- # Backup old channels conf...
- cp -f /etc/vdr/channels.conf \
- /etc/vdr/channels.conf.backup$(date +%Y%m%d%H%M)
- cp -f /tmp/channels.conf /etc/vdr/
- yes_no "Should i start the VDR?"
- clear
- /etc/init.d/vdr start
-fi
diff --git a/lfs/w_scan b/lfs/w_scan
deleted file mode 100644
index 369c1554c..000000000
--- a/lfs/w_scan
+++ /dev/null
@@ -1,86 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
-# #
-# 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 #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-
-VER = 20130331
-
-THISAPP = w_scan-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = w_scan
-PAK_VER = 5
-
-DEPS = ""
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = dfc14a4707321e068a594d6899398df8
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-dist:
- @$(PAK)
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
- @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
- @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
- @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
- @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- install -m 755 $(DIR_SRC)/config/w_scan/w_scan_start /usr/bin/
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 7572c54dd..5e0971a4f 100755
--- a/make.sh
+++ b/make.sh
@@ -1455,7 +1455,6 @@ buildipfire() {
lfsmake2 faad2
lfsmake2 alac
lfsmake2 ffmpeg
- lfsmake2 w_scan
lfsmake2 mpd
lfsmake2 libmpdclient
lfsmake2 mpc
--
2.20.1
next prev parent reply other threads:[~2020-02-12 9:34 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-12 9:34 Drop unused/unmaintained packages Michael Tremer
2020-02-12 9:34 ` [PATCH 01/14] Drop arm Michael Tremer
2020-02-12 9:34 ` [PATCH 02/14] Drop batctl Michael Tremer
2020-02-12 9:34 ` [PATCH 03/14] Drop multicat & bitstream Michael Tremer
2020-02-12 9:34 ` [PATCH 04/14] Drop check_mk_agent Michael Tremer
2020-02-12 9:34 ` [PATCH 05/14] Drop DirectFB Michael Tremer
2020-02-12 9:34 ` [PATCH 06/14] Drop ez-ipupdate Michael Tremer
2020-02-12 9:34 ` [PATCH 07/14] Drop i2c-tools Michael Tremer
2020-02-12 9:34 ` [PATCH 08/14] Drop icecast Michael Tremer
2020-02-12 9:34 ` [PATCH 09/14] Drop icegenerator Michael Tremer
2020-02-12 9:34 ` [PATCH 10/14] Drop rtpproxy Michael Tremer
2020-02-12 9:34 ` [PATCH 11/14] Drop setserial Michael Tremer
2020-02-12 9:34 ` [PATCH 12/14] Drop streamripper Michael Tremer
2020-02-12 9:34 ` [PATCH 13/14] Drop VDR Michael Tremer
2020-02-12 9:34 ` Michael Tremer [this message]
2020-02-15 17:49 ` Drop unused/unmaintained packages Arne Fitzenreiter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200212093453.5732-15-michael.tremer@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox