Bug fixes (menu + grabber) (2)

sunsettrack4 · Apr 7, 2019 · 9eb24a0 · 9eb24a0
1 parent 51e51b2
commit 9eb24a0
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 23 deletions.
diff --git a/combine.sh b/combine.sh
@@ -388,7 +388,7 @@ then
 
  if [ -e hzn_de_channels.json ]
  then
- sed '/{"channels":\[/d;/}/d;s/",//g;s/\]//g;s/"//g' hzn_de_channels.json > /tmp/channels_de && cat /tmp/channels_de >> /tmp/xmlch2
+ sed '/{"channels":\[/d;/}/d;s/",//g;s/"\]//g;s/"//g' hzn_de_channels.json > /tmp/channels_de && cat /tmp/channels_de >> /tmp/xmlch2
  sed -i 's/.*/[HORIZON DE] &/g' /tmp/channels_de
 
  comm -12 <(sort -u /tmp/xmlch_de) <(sort -u /tmp/channels_de) > /tmp/comm_menu_enabled
@@ -413,7 +413,7 @@ then
 
  if [ -e hzn_at_channels.json ]
  then
- sed '/{"channels":\[/d;/}/d;s/",//g;s/\]//g;s/"//g' hzn_at_channels.json > /tmp/channels_at && cat /tmp/channels_at >> /tmp/xmlch2
+ sed '/{"channels":\[/d;/}/d;s/",//g;s/"\]//g;s/"//g' hzn_at_channels.json > /tmp/channels_at && cat /tmp/channels_at >> /tmp/xmlch2
  sed -i 's/.*/[HORIZON AT] &/g' /tmp/channels_at
 
  comm -12 <(sort -u /tmp/xmlch_at) <(sort -u /tmp/channels_at) > /tmp/comm_menu_enabled
@@ -438,7 +438,7 @@ then
 
  if [ -e hzn_ch_channels.json ]
  then
- sed '/{"channels":\[/d;/}/d;s/",//g;s/\]//g;s/"//g' hzn_ch_channels.json > /tmp/channels_ch && cat /tmp/channels_ch >> /tmp/xmlch2
+ sed '/{"channels":\[/d;/}/d;s/",//g;s/"\]//g;s/"//g' hzn_ch_channels.json > /tmp/channels_ch && cat /tmp/channels_ch >> /tmp/xmlch2
  sed -i 's/.*/[HORIZON CH] &/g' /tmp/channels_ch
 
  comm -12 <(sort -u /tmp/xmlch_ch) <(sort -u /tmp/channels_ch) > /tmp/comm_menu_enabled
@@ -463,7 +463,7 @@ then
 
  if [ -e hzn_nl_channels.json ]
  then
- sed '/{"channels":\[/d;/}/d;s/",//g;s/\]//g;s/"//g' hzn_nl_channels.json > /tmp/channels_nl && cat /tmp/channels_nl >> /tmp/xmlch2
+ sed '/{"channels":\[/d;/}/d;s/",//g;s/"\]//g;s/"//g' hzn_nl_channels.json > /tmp/channels_nl && cat /tmp/channels_nl >> /tmp/xmlch2
  sed -i 's/.*/[HORIZON NL] &/g' /tmp/channels_nl
 
  comm -12 <(sort -u /tmp/xmlch_nl) <(sort -u /tmp/channels_nl) > /tmp/comm_menu_enabled
@@ -488,7 +488,7 @@ then
 
  if [ -e hzn_pl_channels.json ]
  then
- sed '/{"channels":\[/d;/}/d;s/",//g;s/\]//g;s/"//g' hzn_pl_channels.json > /tmp/channels_pl && cat /tmp/channels_pl >> /tmp/xmlch2
+ sed '/{"channels":\[/d;/}/d;s/",//g;s/"\]//g;s/"//g' hzn_pl_channels.json > /tmp/channels_pl && cat /tmp/channels_pl >> /tmp/xmlch2
  sed -i 's/.*/[HORIZON PL] &/g' /tmp/channels_pl
 
  comm -12 <(sort -u /tmp/xmlch_pl) <(sort -u /tmp/channels_pl) > /tmp/comm_menu_enabled
@@ -513,7 +513,7 @@ then
 
  if [ -e hzn_ie_channels.json ]
  then
- sed '/{"channels":\[/d;/}/d;s/",//g;s/\]//g;s/"//g' hzn_ie_channels.json > /tmp/channels_ie && cat /tmp/channels_ie >> /tmp/xmlch2
+ sed '/{"channels":\[/d;/}/d;s/",//g;s/"\]//g;s/"//g' hzn_ie_channels.json > /tmp/channels_ie && cat /tmp/channels_ie >> /tmp/xmlch2
  sed -i 's/.*/[HORIZON IE] &/g' /tmp/channels_ie
 
  comm -12 <(sort -u /tmp/xmlch_ie) <(sort -u /tmp/channels_ie) > /tmp/comm_menu_enabled
@@ -538,7 +538,7 @@ then
 
  if [ -e hzn_sk_channels.json ]
  then
- sed '/{"channels":\[/d;/}/d;s/",//g;s/\]//g;s/"//g' hzn_sk_channels.json > /tmp/channels_sk && cat /tmp/channels_sk >> /tmp/xmlch2
+ sed '/{"channels":\[/d;/}/d;s/",//g;s/"\]//g;s/"//g' hzn_sk_channels.json > /tmp/channels_sk && cat /tmp/channels_sk >> /tmp/xmlch2
  sed -i 's/.*/[HORIZON SK] &/g' /tmp/channels_sk
 
  comm -12 <(sort -u /tmp/xmlch_sk) <(sort -u /tmp/channels_sk) > /tmp/comm_menu_enabled
@@ -563,7 +563,7 @@ then
 
  if [ -e hzn_cz_channels.json ]
  then
- sed '/{"channels":\[/d;/}/d;s/",//g;s/\]//g;s/"//g' hzn_cz_channels.json > /tmp/channels_cz && cat /tmp/channels_cz >> /tmp/xmlch2
+ sed '/{"channels":\[/d;/}/d;s/",//g;s/"\]//g;s/"//g' hzn_cz_channels.json > /tmp/channels_cz && cat /tmp/channels_cz >> /tmp/xmlch2
  sed -i 's/.*/[HORIZON CZ] &/g' /tmp/channels_cz
 
  comm -12 <(sort -u /tmp/xmlch_cz) <(sort -u /tmp/channels_cz) > /tmp/comm_menu_enabled
@@ -588,7 +588,7 @@ then
 
  if [ -e hzn_hu_channels.json ]
  then
- sed '/{"channels":\[/d;/}/d;s/",//g;s/\]//g;s/"//g' hzn_hu_channels.json > /tmp/channels_hu && cat /tmp/channels_hu >> /tmp/xmlch2
+ sed '/{"channels":\[/d;/}/d;s/",//g;s/"\]//g;s/"//g' hzn_hu_channels.json > /tmp/channels_hu && cat /tmp/channels_hu >> /tmp/xmlch2
  sed -i 's/.*/[HORIZON HU] &/g' /tmp/channels_hu
 
  comm -12 <(sort -u /tmp/xmlch_hu) <(sort -u /tmp/channels_hu) > /tmp/comm_menu_enabled
@@ -613,7 +613,7 @@ then
 
  if [ -e hzn_ro_channels.json ]
  then
- sed '/{"channels":\[/d;/}/d;s/",//g;s/\]//g;s/"//g' hzn_ro_channels.json > /tmp/channels_ro && cat /tmp/channels_ro >> /tmp/xmlch2
+ sed '/{"channels":\[/d;/}/d;s/",//g;s/"\]//g;s/"//g' hzn_ro_channels.json > /tmp/channels_ro && cat /tmp/channels_ro >> /tmp/xmlch2
  sed -i 's/.*/[HORIZON RO] &/g' /tmp/channels_ro
 
  comm -12 <(sort -u /tmp/xmlch_ro) <(sort -u /tmp/channels_ro) > /tmp/comm_menu_enabled
@@ -638,7 +638,7 @@ then
 
  if [ -e ztt_de_channels.json ]
  then
- sed '/{"channels":\[/d;/}/d;s/",//g;s/\]//g;s/"//g' ztt_de_channels.json > /tmp/channels_zde && cat /tmp/channels_zde >> /tmp/xmlch2
+ sed '/{"channels":\[/d;/}/d;s/",//g;s/"\]//g;s/"//g' ztt_de_channels.json > /tmp/channels_zde && cat /tmp/channels_zde >> /tmp/xmlch2
  sed -i 's/.*/[ZATTOO DE] &/g' /tmp/channels_zde
 
  comm -12 <(sort -u /tmp/xmlch_zde) <(sort -u /tmp/channels_zde) > /tmp/comm_menu_enabled
@@ -663,7 +663,7 @@ then
 
  if [ -e ztt_ch_channels.json ]
  then
- sed '/{"channels":\[/d;/}/d;s/",//g;s/\]//g;s/"//g' ztt_ch_channels.json > /tmp/channels_zch && cat /tmp/channels_zch >> /tmp/xmlch2
+ sed '/{"channels":\[/d;/}/d;s/",//g;s/"\]//g;s/"//g' ztt_ch_channels.json > /tmp/channels_zch && cat /tmp/channels_zch >> /tmp/xmlch2
  sed -i 's/.*/[ZATTOO CH] &/g' /tmp/channels_zch
 
  comm -12 <(sort -u /tmp/xmlch_zch) <(sort -u /tmp/channels_zch) > /tmp/comm_menu_enabled
@@ -688,7 +688,7 @@ then
 
  if [ -e swc_ch_channels.json ]
  then
- sed '/{"channels":\[/d;/}/d;s/",//g;s/\]//g;s/"//g' swc_ch_channels.json > /tmp/channels_swc && cat /tmp/channels_swc >> /tmp/xmlch2
+ sed '/{"channels":\[/d;/}/d;s/",//g;s/"\]//g;s/"//g' swc_ch_channels.json > /tmp/channels_swc && cat /tmp/channels_swc >> /tmp/xmlch2
  sed -i 's/.*/[SWISSCOM CH] &/g' /tmp/channels_swc
 
  comm -12 <(sort -u /tmp/xmlch_swc) <(sort -u /tmp/channels_swc) > /tmp/comm_menu_enabled

diff --git a/epg.sh b/epg.sh
@@ -22,7 +22,7 @@
 clear
 echo " --------------------------------------------"
 echo " EASYEPG SIMPLE XMLTV GRABBER "
-echo " Release v0.1.6 BETA - 2019/04/06 "
+echo " Release v0.1.7 BETA - 2019/04/07 "
 echo " powered by "
 echo " "
 echo " ==THE======================================="
@@ -793,7 +793,7 @@ do
  mkdir ztt/de
  chmod 0777 ztt/de
  echo '{"country":"DE","language":"de"}' > ztt/de/init.json
- sed '138s/XX/DE/g' ztt/settings.sh > ztt/de/settings.sh
+ sed '138,172s/XX/DE/g' ztt/settings.sh > ztt/de/settings.sh
  cp ztt/ztt.sh ztt/de/ztt.sh
  cp ztt/compare_crid.pl ztt/de/
  cp ztt/save_page.js ztt/de/
@@ -822,7 +822,7 @@ do
  mkdir ztt/ch
  chmod 0777 ztt/ch
  echo '{"country":"CH","language":"de"}' > ztt/ch/init.json
- sed '138s/XX/CH/g' ztt/settings.sh > ztt/ch/settings.sh
+ sed '138,172s/XX/CH/g' ztt/settings.sh > ztt/ch/settings.sh
  cp ztt/ztt.sh ztt/ch/ztt.sh
  cp ztt/compare_crid.pl ztt/ch/
  cp ztt/save_page.js ztt/ch/

diff --git a/hzn/settings.sh b/hzn/settings.sh
@@ -226,7 +226,7 @@ do
 
  if [ -s /tmp/chconf ]
  then
- sed 's/" "/","/g;s/\\\[[^ ]* //g;s/\\(/(/g;s/\\)/)/g;s/.*/{"channels":[&]}/g;s/\\\&/\&amp;/g' /tmp/chconf > channels.json
+ sed 's/" "/","/g;s/\\\[[0-9][^]]*\] //g;s/\\(/(/g;s/\\)/)/g;s/.*/{"channels":[&]}/g;s/\\\&/\&amp;/g;s/\\//g' /tmp/chconf > channels.json
  cp /tmp/chlist chlist_old
  dialog --backtitle "[H1110] EASYEPG SIMPLE XMLTV GRABBER > HORIZON SETTINGS > CHANNEL LIST" --title "INFO" --msgbox "New channel list added!\nPlease run the grabber to add the channels to the setup modules!" 7 50
  echo "H" > /tmp/value
@@ -256,7 +256,7 @@ do
 
  if [ -s /tmp/chconf ]
  then
- sed 's/" "/","/g;s/\\\[[^ ]* //g;s/\\(/(/g;s/\\)/)/g;s/.*/{"channels":[&]}/g;s/\\\&/\&amp;/g' /tmp/chconf > channels.json
+ sed 's/" "/","/g;s/\\\[[0-9][^]]*\] //g;s/\\(/(/g;s/\\)/)/g;s/.*/{"channels":[&]}/g;s/\\\&/\&amp;/g;s/\\//g' /tmp/chconf > channels.json
  dialog --backtitle "[H1130] EASYEPG SIMPLE XMLTV GRABBER > HORIZON SETTINGS > CHANNEL LIST" --title "INFO" --msgbox "New channel list saved!\nPlease run the grabber to add new channels to the setup modules!" 7 50
  echo "H" > /tmp/value
  else

diff --git a/swc/settings.sh b/swc/settings.sh
@@ -185,7 +185,7 @@ do
 
  if [ -s /tmp/chconf ]
  then
- sed 's/" "/","/g;s/\\\[[^ ]* //g;s/\\(/(/g;s/\\)/)/g;s/.*/{"channels":[&]}/g;s/\\\&/\&amp;/g' /tmp/chconf > channels.json
+ sed 's/" "/","/g;s/\\\[[0-9][^]]*\] //g;s/\\(/(/g;s/\\)/)/g;s/.*/{"channels":[&]}/g;s/\\\&/\&amp;/g;s/\\//g' /tmp/chconf > channels.json
  cp /tmp/chlist chlist_old
  dialog --backtitle "[S1110] EASYEPG SIMPLE XMLTV GRABBER > SWISSCOM SETTINGS > CHANNEL LIST" --title "INFO" --msgbox "New channel list added!\nPlease run the grabber to add the channels to the setup modules!" 7 50
  echo "H" > /tmp/value
@@ -215,7 +215,7 @@ do
 
  if [ -s /tmp/chconf ]
  then
- sed 's/" "/","/g;s/\\\[[^ ]* //g;s/\\(/(/g;s/\\)/)/g;s/.*/{"channels":[&]}/g;s/\\\&/\&amp;/g' /tmp/chconf > channels.json
+ sed 's/" "/","/g;s/\\\[[0-9][^]]*\] //g;s/\\(/(/g;s/\\)/)/g;s/.*/{"channels":[&]}/g;s/\\\&/\&amp;/g;s/\\//g' /tmp/chconf > channels.json
  dialog --backtitle "[S1130] EASYEPG SIMPLE XMLTV GRABBER > SWISSCOM SETTINGS > CHANNEL LIST" --title "INFO" --msgbox "New channel list saved!\nPlease run the grabber to add new channels to the setup modules!" 7 50
  echo "H" > /tmp/value
  else

diff --git a/ztt/settings.sh b/ztt/settings.sh
@@ -169,7 +169,7 @@ echo "H" > /tmp/value
 while grep -q "H" /tmp/value
 do
  # Z3000 MENU OVERLAY
- echo 'dialog --backtitle "[Z3000] EASYEPG SIMPLE XMLTV GRABBER > ZATTOO SETTINGS [X]" --title "SETTINGS" --menu "Please select the option you want to change:" 14 60 10 \' > /tmp/menu 
+ echo 'dialog --backtitle "[Z3000] EASYEPG SIMPLE XMLTV GRABBER > ZATTOO SETTINGS [XX]" --title "SETTINGS" --menu "Please select the option you want to change:" 14 60 10 \' > /tmp/menu 
 
  if [ ! -e settings.json ]
  then
@@ -327,7 +327,7 @@ do
 
  if [ -s /tmp/chconf ]
  then
- sed 's/" "/","/g;s/\\\[[^ ]* //g;s/\\(/(/g;s/\\)/)/g;s/.*/{"channels":[&]}/g;s/\\\&/\&amp;/g' /tmp/chconf > channels.json
+ sed 's/" "/","/g;s/\\\[[0-9][^]]*\] //g;s/\\(/(/g;s/\\)/)/g;s/.*/{"channels":[&]}/g;s/\\\&/\&amp;/g;s/\\//g' /tmp/chconf > channels.json
  cp /tmp/chlist chlist_old
  dialog --backtitle "[Z3110] EASYEPG SIMPLE XMLTV GRABBER > ZATTOO SETTINGS > CHANNEL LIST" --title "INFO" --msgbox "New channel list added!\nPlease run the grabber to add the channels to the setup modules!" 7 50
  echo "H" > /tmp/value
@@ -357,7 +357,7 @@ do
 
  if [ -s /tmp/chconf ]
  then
- sed 's/" "/","/g;s/\\\[[^ ]* //g;s/\\(/(/g;s/\\)/)/g;s/.*/{"channels":[&]}/g;s/\\\&/\&amp;/g' /tmp/chconf > channels.json
+ sed 's/" "/","/g;s/\\\[[0-9][^]]*\] //g;s/\\(/(/g;s/\\)/)/g;s/.*/{"channels":[&]}/g;s/\\\&/\&amp;/g;s/\\//g' /tmp/chconf > channels.json
  dialog --backtitle "[Z3130] EASYEPG SIMPLE XMLTV GRABBER > ZATTOO SETTINGS > CHANNEL LIST" --title "INFO" --msgbox "New channel list saved!\nPlease run the grabber to add new channels to the setup modules!" 7 50
  echo "H" > /tmp/value
  else