This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, thirteen has been updated via bb91f5a5440c761640b4b413a3ba8f476e05a4d6 (commit) from ee9987e89e10e8f1bd13b77ce759e4ade8070235 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit bb91f5a5440c761640b4b413a3ba8f476e05a4d6 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Nov 18 00:06:39 2012 +0100

w_scan: some fixes for startskript.

-----------------------------------------------------------------------

Summary of changes: config/w_scan/w_scan_start | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) mode change 100644 => 100755 config/w_scan/w_scan_start

Difference in files: diff --git a/config/w_scan/w_scan_start b/config/w_scan/w_scan_start old mode 100644 new mode 100755 index 7a908e6..0f624ac --- a/config/w_scan/w_scan_start +++ b/config/w_scan/w_scan_start @@ -46,6 +46,9 @@ yes_no ()

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!"; @@ -56,17 +59,16 @@ fi

# Is vdr running? if [ "$(ps -A | grep " runvdr$")" != "" ] ;then - yes_no "Vdr is runnung. Cannot scan with active vdr. Should i stop it?" + yes_no "VDR is running. Cannot scan with active VDR. Should I stop it?" clear /etc/init.d/vdr stop - HAS_VDR_STOPPED=YES fi

# Select DVB type whiptail --checklist "\nSelect DVB type" 12 40 3 \ DVB-T "Terrestrial" yes \ DVB-C "Cable" no \ - DVB-S "Satelite" no \ + DVB-S "Satellite" no \ 2>/tmp/w_scan_type chk_cancel W_SCAN_TYPE=$(cat /tmp/w_scan_type) @@ -88,32 +90,32 @@ 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 satelites" 19 70 10 ' >> /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_satelite' >> /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_SATELITE=$(cat /tmp/w_scan_satelite | sed 's|"||g') - rm /tmp/w_scan_satelite + 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)" >>/tmp/channels.conf + echo ":->W-SCAN DVB-T $(date +%Y%m%d%H%M)" >>/tmp/channels.conf $WSCAN -f t -c $W_SCAN_COUNTRY -C UTF-8 >>/tmp/channels.conf fi if [[ "$W_SCAN_TYPE" == *DVB-C* ]]; then - echo ":->W-SCAN DVB-C $(date)" >>/tmp/channels.conf + echo ":->W-SCAN DVB-C $(date +%Y%m%d%H%M)" >>/tmp/channels.conf $WSCAN -f c -c $W_SCAN_COUNTRY -C UTF-8 >>/tmp/channels.conf fi if [[ "$W_SCAN_TYPE" == *DVB-S* ]]; then - for SATELITE in $W_SCAN_SATELITE; + for SATELLITE in $W_SCAN_SATELLITE; do - echo ":->W-SCAN DVB-S-$SATELITE $(date)" >>/tmp/channels.conf - $WSCAN -f s -s $SATELITE -C UTF-8 >>/tmp/channels.conf + echo ":->W-SCAN DVB-S $SATELLITE $(date +%Y%m%d%H%M)" >>/tmp/channels.conf + $WSCAN -f s -s $SATELLITE -C UTF-8 >>/tmp/channels.conf done fi

@@ -123,12 +125,12 @@ 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." + yes_no "Install new channels-conf for VDR." # Backup old channels conf... cp -f /opt/vdr/etc/channels.conf \ /opt/vdr/etc/channels.conf.backup$(date +%Y%m%d%H%M) cp -f /tmp/channels.conf /opt/vdr/etc/ - yes_no "Should i start the vdr?" + yes_no "Should i start the VDR?" clear /etc/init.d/vdr start fi

hooks/post-receive -- IPFire 2.x development tree