Skip to content
This repository has been archived by the owner on Oct 27, 2022. It is now read-only.

Commit

Permalink
Merge pull request #13 from sunsettrack4/master
Browse files Browse the repository at this point in the history 
Sync with Easy Master
  • Loading branch information
@DeBaschdi
DeBaschdi authored Oct 8, 2019
2 parents fd88b0f + d052abf commit fbd5db1
Show file tree
Hide file tree
Showing 6 changed files with 223 additions and 37 deletions.
4 changes: 2 additions & 2 deletions epg.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
clear
echo " --------------------------------------------"
echo " EASYEPG SIMPLE XMLTV GRABBER "
echo " Release v0.4.0 BETA - 2019/07/09 "
echo " Release v0.4.0 BETA "
echo " powered by "
echo " "
echo " ==THE======================================="
Expand Down Expand Up @@ -587,7 +587,7 @@ fi

cd $(pwd)
echo "DIR=$(pwd)" > /tmp/initrun.txt
echo "VER=v0.4.0" >> /tmp/initrun.txt
echo "VER=v0.4.0 2019/10/07" >> /tmp/initrun.txt

#
# CHECK INTERNET CONNECTIVITY
Expand Down
60 changes: 30 additions & 30 deletions prog_combine.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,9 @@
}
} else {
if( defined $title_lang ) {
print " <title lang=\"" . $title_lang . "\">No programme available</title>\n";
print " <title lang=\"" . $title_lang . "\">No program information available</title>\n";
} else {
print " <title>No programme available</title>\n";
print " <title>No program information available</title>\n";
}
}

Expand Down Expand Up @@ -308,9 +308,9 @@
}
} else {
if( defined $title_lang ) {
print " <title lang=\"" . $title_lang . "\">No programme available</title>\n";
print " <title lang=\"" . $title_lang . "\">No program information available</title>\n";
} else {
print " <title>No programme available</title>\n";
print " <title>No program information available</title>\n";
}
}

Expand Down Expand Up @@ -451,9 +451,9 @@
}
} else {
if( defined $title_lang ) {
print " <title lang=\"" . $title_lang . "\">No programme available</title>\n";
print " <title lang=\"" . $title_lang . "\">No program information available</title>\n";
} else {
print " <title>No programme available</title>\n";
print " <title>No program information available</title>\n";
}
}

Expand Down Expand Up @@ -594,9 +594,9 @@
}
} else {
if( defined $title_lang ) {
print " <title lang=\"" . $title_lang . "\">No programme available</title>\n";
print " <title lang=\"" . $title_lang . "\">No program information available</title>\n";
} else {
print " <title>No programme available</title>\n";
print " <title>No program information available</title>\n";
}
}

Expand Down Expand Up @@ -737,9 +737,9 @@
}
} else {
if( defined $title_lang ) {
print " <title lang=\"" . $title_lang . "\">No programme available</title>\n";
print " <title lang=\"" . $title_lang . "\">No program information available</title>\n";
} else {
print " <title>No programme available</title>\n";
print " <title>No program information available</title>\n";
}
}

Expand Down Expand Up @@ -880,9 +880,9 @@
}
} else {
if( defined $title_lang ) {
print " <title lang=\"" . $title_lang . "\">No programme available</title>\n";
print " <title lang=\"" . $title_lang . "\">No program information available</title>\n";
} else {
print " <title>No programme available</title>\n";
print " <title>No program information available</title>\n";
}
}

Expand Down Expand Up @@ -1023,9 +1023,9 @@
}
} else {
if( defined $title_lang ) {
print " <title lang=\"" . $title_lang . "\">No programme available</title>\n";
print " <title lang=\"" . $title_lang . "\">No program information available</title>\n";
} else {
print " <title>No programme available</title>\n";
print " <title>No program information available</title>\n";
}
}

Expand Down Expand Up @@ -1166,9 +1166,9 @@
}
} else {
if( defined $title_lang ) {
print " <title lang=\"" . $title_lang . "\">No programme available</title>\n";
print " <title lang=\"" . $title_lang . "\">No program information available</title>\n";
} else {
print " <title>No programme available</title>\n";
print " <title>No program information available</title>\n";
}
}

Expand Down Expand Up @@ -1309,9 +1309,9 @@
}
} else {
if( defined $title_lang ) {
print " <title lang=\"" . $title_lang . "\">No programme available</title>\n";
print " <title lang=\"" . $title_lang . "\">No program information available</title>\n";
} else {
print " <title>No programme available</title>\n";
print " <title>No program information available</title>\n";
}
}

Expand Down Expand Up @@ -1452,9 +1452,9 @@
}
} else {
if( defined $title_lang ) {
print " <title lang=\"" . $title_lang . "\">No programme available</title>\n";
print " <title lang=\"" . $title_lang . "\">No program information available</title>\n";
} else {
print " <title>No programme available</title>\n";
print " <title>No program information available</title>\n";
}
}

Expand Down Expand Up @@ -1595,9 +1595,9 @@
}
} else {
if( defined $title_lang ) {
print " <title lang=\"" . $title_lang . "\">No programme available</title>\n";
print " <title lang=\"" . $title_lang . "\">No program information available</title>\n";
} else {
print " <title>No programme available</title>\n";
print " <title>No program information available</title>\n";
}
}

Expand Down Expand Up @@ -1738,9 +1738,9 @@
}
} else {
if( defined $title_lang ) {
print " <title lang=\"" . $title_lang . "\">No programme available</title>\n";
print " <title lang=\"" . $title_lang . "\">No program information available</title>\n";
} else {
print " <title>No programme available</title>\n";
print " <title>No program information available</title>\n";
}
}

Expand Down Expand Up @@ -1881,9 +1881,9 @@
}
} else {
if( defined $title_lang ) {
print " <title lang=\"" . $title_lang . "\">No programme available</title>\n";
print " <title lang=\"" . $title_lang . "\">No program information available</title>\n";
} else {
print " <title>No programme available</title>\n";
print " <title>No program information available</title>\n";
}
}

Expand Down Expand Up @@ -2024,9 +2024,9 @@
}
} else {
if( defined $title_lang ) {
print " <title lang=\"" . $title_lang . "\">No programme available</title>\n";
print " <title lang=\"" . $title_lang . "\">No program information available</title>\n";
} else {
print " <title>No programme available</title>\n";
print " <title>No program information available</title>\n";
}
}

Expand Down Expand Up @@ -2165,9 +2165,9 @@
}
} else {
if( defined $title_lang ) {
print " <title lang=\"" . $title_lang . "\">No programme available</title>\n";
print " <title lang=\"" . $title_lang . "\">No program information available</title>\n";
} else {
print " <title>No programme available</title>\n";
print " <title>No program information available</title>\n";
}
}

Expand Down
185 changes: 185 additions & 0 deletions testing.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,185 @@
#!/bin/bash

# #########################
# USE TESTING BRANCH #
# #########################

# GIT CLONE

git clone https://github.com/sunsettrack4/easyepg --branch TESTING

# MAIN
echo "Updating main..."

cp easyepg/epg.sh epg.sh 2> /dev/null
cp easyepg/ch_combine.pl ch_combine.pl 2> /dev/null
cp easyepg/combine.sh combine.sh 2> /dev/null
cp easyepg/prog_combine.pl prog_combine.pl 2> /dev/null
cp easyepg/LICENSE LICENSE 2> /dev/null
cp easyepg/update.sh update.sh 2> /dev/null


# HORIZON
echo "Updating Horizon..."

mkdir hzn 2> /dev/null

echo "hzn/ hzn/de/ hzn/at/ hzn/ch/ hzn/nl/ hzn/pl/ hzn/ie/ hzn/sk/ hzn/cz/ hzn/hu/ hzn/ro/" | xargs -n 1 cp -v easyepg/hzn/hzn.sh 2> /dev/null
echo "hzn/ hzn/de/ hzn/at/ hzn/ch/ hzn/nl/ hzn/pl/ hzn/ie/ hzn/sk/ hzn/cz/ hzn/hu/ hzn/ro/" | xargs -n 1 cp -v easyepg/hzn/ch_json2xml.pl 2> /dev/null
echo "hzn/ hzn/de/ hzn/at/ hzn/ch/ hzn/nl/ hzn/pl/ hzn/ie/ hzn/sk/ hzn/cz/ hzn/hu/ hzn/ro/" | xargs -n 1 cp -v easyepg/hzn/cid_json.pl 2> /dev/null
echo "hzn/ hzn/de/ hzn/at/ hzn/ch/ hzn/nl/ hzn/pl/ hzn/ie/ hzn/sk/ hzn/cz/ hzn/hu/ hzn/ro/" | xargs -n 1 cp -v easyepg/hzn/epg_json2xml.pl 2> /dev/null
echo "hzn/ hzn/de/ hzn/at/ hzn/ch/ hzn/nl/ hzn/pl/ hzn/ie/ hzn/sk/ hzn/cz/ hzn/hu/ hzn/ro/" | xargs -n 1 cp -v easyepg/hzn/settings.sh 2> /dev/null
echo "hzn/ hzn/de/ hzn/at/ hzn/ch/ hzn/nl/ hzn/pl/ hzn/ie/ hzn/sk/ hzn/cz/ hzn/hu/ hzn/ro/" | xargs -n 1 cp -v easyepg/hzn/chlist_printer.pl 2> /dev/null
echo "hzn/ hzn/de/ hzn/at/ hzn/ch/ hzn/nl/ hzn/pl/ hzn/ie/ hzn/sk/ hzn/cz/ hzn/hu/ hzn/ro/" | xargs -n 1 cp -v easyepg/hzn/compare_menu.pl.sh 2> /dev/null
echo "hzn/ hzn/de/ hzn/at/ hzn/ch/ hzn/nl/ hzn/pl/ hzn/ie/ hzn/sk/ hzn/cz/ hzn/hu/ hzn/ro/" | xargs -n 1 cp -v easyepg/hzn/hzn.sh 2> /dev/null
echo "hzn/ hzn/de/ hzn/at/ hzn/ch/ hzn/nl/ hzn/pl/ hzn/ie/ hzn/sk/ hzn/cz/ hzn/hu/ hzn/ro/" | xargs -n 1 cp -v easyepg/hzn/hzn.sh 2> /dev/null

sed 's/XX/DE/g;s/YYY/deu/g' easyepg/hzn/url_printer.pl > hzn/de/url_printer.pl 2> /dev/null
sed 's/XX/AT/g;s/YYY/deu/g' easyepg/hzn/url_printer.pl > hzn/at/url_printer.pl 2> /dev/null
sed 's/XX/CH/g;s/YYY/deu/g' easyepg/hzn/url_printer.pl > hzn/ch/url_printer.pl 2> /dev/null
sed 's/XX/NL/g;s/YYY/nld/g' easyepg/hzn/url_printer.pl > hzn/nl/url_printer.pl 2> /dev/null
sed 's/XX/PL/g;s/YYY/pol/g' easyepg/hzn/url_printer.pl > hzn/pl/url_printer.pl 2> /dev/null
sed 's/XX/IE/g;s/YYY/eng/g' easyepg/hzn/url_printer.pl > hzn/ie/url_printer.pl 2> /dev/null
sed 's/XX/SK/g;s/YYY/slk/g' easyepg/hzn/url_printer.pl > hzn/sk/url_printer.pl 2> /dev/null
sed 's/XX/CZ/g;s/YYY/ces/g' easyepg/hzn/url_printer.pl > hzn/cz/url_printer.pl 2> /dev/null
sed 's/XX/HU/g;s/YYY/hun/g' easyepg/hzn/url_printer.pl > hzn/hu/url_printer.pl 2> /dev/null
sed 's/XX/RO/g;s/YYY/ron/g' easyepg/hzn/url_printer.pl > hzn/ro/url_printer.pl 2> /dev/null


# ZATTOO
echo "Updating Zattoo..."

mkdir ztt 2> /dev/null

echo "ztt/ ztt/de/ ztt/ch/" | xargs -n 1 cp -v easyepg/ztt/ztt.sh 2> /dev/null
echo "ztt/ ztt/de/ ztt/ch/" | xargs -n 1 cp -v easyepg/ztt/compare_crid.pl 2> /dev/null
echo "ztt/ ztt/de/ ztt/ch/" | xargs -n 1 cp -v easyepg/ztt/save_page.js 2> /dev/null
echo "ztt/ ztt/de/ ztt/ch/" | xargs -n 1 cp -v easyepg/ztt/epg_json2xml.pl 2> /dev/null
echo "ztt/ ztt/de/ ztt/ch/" | xargs -n 1 cp -v easyepg/ztt/ch_json2xml.pl 2> /dev/null
echo "ztt/ ztt/de/ ztt/ch/" | xargs -n 1 cp -v easyepg/ztt/cid_json.pl 2> /dev/null
echo "ztt/ ztt/de/ ztt/ch/" | xargs -n 1 cp -v easyepg/ztt/chlist_printer.pl 2> /dev/null
echo "ztt/ ztt/de/ ztt/ch/" | xargs -n 1 cp -v easyepg/ztt/compare_menu.pl 2> /dev/null

sed 's/\[XX\]/[DE]/g;s/XXXX/DE/g' easyepg/ztt/settings.sh > ztt/de/settings.sh 2> /dev/null
sed 's/\[XX\]/[CH]/g;s/XXXX/CH/g' easyepg/ztt/settings.sh > ztt/ch/settings.sh 2> /dev/null


# SWISSCOM
echo "Updating Swisscom..."

mkdir swc 2> /dev/null

echo "swc/ swc/ch/" | xargs -n 1 cp -v easyepg/swc/swc.sh 2> /dev/null
echo "swc/ swc/ch/" | xargs -n 1 cp -v easyepg/swc/settings.sh 2> /dev/null
echo "swc/ swc/ch/" | xargs -n 1 cp -v easyepg/swc/epg_json2xml.pl 2> /dev/null
echo "swc/ swc/ch/" | xargs -n 1 cp -v easyepg/swc/ch_json2xml.pl 2> /dev/null
echo "swc/ swc/ch/" | xargs -n 1 cp -v easyepg/swc/cid_json.pl 2> /dev/null
echo "swc/ swc/ch/" | xargs -n 1 cp -v easyepg/swc/chlist_printer.pl 2> /dev/null
echo "swc/ swc/ch/" | xargs -n 1 cp -v easyepg/swc/compare_menu.pl 2> /dev/null
echo "swc/ swc/ch/" | xargs -n 1 cp -v easyepg/swc/url_printer.pl 2> /dev/null


# TVPLAYER
echo "Updating tvPlayer..."

mkdir tvp 2> /dev/null

echo "tvp/ tvp/uk/" | xargs -n 1 cp -v easyepg/tvp/tvp.sh 2> /dev/null
echo "tvp/ tvp/uk/" | xargs -n 1 cp -v easyepg/tvp/settings.sh 2> /dev/null
echo "tvp/ tvp/uk/" | xargs -n 1 cp -v easyepg/tvp/epg_json2xml.pl 2> /dev/null
echo "tvp/ tvp/uk/" | xargs -n 1 cp -v easyepg/tvp/ch_json2xml.pl 2> /dev/null
echo "tvp/ tvp/uk/" | xargs -n 1 cp -v easyepg/tvp/cid_json.pl 2> /dev/null
echo "tvp/ tvp/uk/" | xargs -n 1 cp -v easyepg/tvp/chlist_printer.pl 2> /dev/null
echo "tvp/ tvp/uk/" | xargs -n 1 cp -v easyepg/tvp/compare_menu.pl 2> /dev/null


# TELEKOM
echo "Updating Telekom..."

mkdir tkm 2> /dev/null

echo "tkm/ tkm/de/" | xargs -n 1 cp -v easyepg/tkm/tkm.sh 2> /dev/null
echo "tkm/ tkm/de/" | xargs -n 1 cp -v easyepg/tkm/settings.sh 2> /dev/null
echo "tkm/ tkm/de/" | xargs -n 1 cp -v easyepg/tkm/epg_json2xml.pl 2> /dev/null
echo "tkm/ tkm/de/" | xargs -n 1 cp -v easyepg/tkm/ch_json2xml.pl 2> /dev/null
echo "tkm/ tkm/de/" | xargs -n 1 cp -v easyepg/tkm/cid_json.pl 2> /dev/null
echo "tkm/ tkm/de/" | xargs -n 1 cp -v easyepg/tkm/chlist_printer.pl 2> /dev/null
echo "tkm/ tkm/de/" | xargs -n 1 cp -v easyepg/tkm/compare_menu.pl 2> /dev/null
echo "tkm/ tkm/de/" | xargs -n 1 cp -v easyepg/tkm/url_printer.pl 2> /dev/null
echo "tkm/ tkm/de/" | xargs -n 1 cp -v easyepg/tkm/proxy.sh 2> /dev/null
echo "tkm/ tkm/de/" | xargs -n 1 cp -v easyepg/tkm/web_magentatv_de.php 2> /dev/null

# RADIOTIMES
echo "Updating RadioTimes..."

mkdir rdt 2> /dev/null

echo "rdt/ rdt/uk/" | xargs -n 1 cp -v easyepg/rdt/rdt.sh 2> /dev/null
echo "rdt/ rdt/uk/" | xargs -n 1 cp -v easyepg/rdt/settings.sh 2> /dev/null
echo "rdt/ rdt/uk/" | xargs -n 1 cp -v easyepg/rdt/epg_json2xml.pl 2> /dev/null
echo "rdt/ rdt/uk/" | xargs -n 1 cp -v easyepg/rdt/ch_json2xml.pl 2> /dev/null
echo "rdt/ rdt/uk/" | xargs -n 1 cp -v easyepg/rdt/cid_json.pl 2> /dev/null
echo "rdt/ rdt/uk/" | xargs -n 1 cp -v easyepg/rdt/chlist_printer.pl 2> /dev/null
echo "rdt/ rdt/uk/" | xargs -n 1 cp -v easyepg/rdt/compare_menu.pl 2> /dev/null
echo "rdt/ rdt/uk/" | xargs -n 1 cp -v easyepg/rdt/compare_crid.pl 2> /dev/null
echo "rdt/ rdt/uk/" | xargs -n 1 cp -v easyepg/rdt/url_printer.pl 2> /dev/null


# WAIPU.TV
echo "Updating waipu.tv..."

mkdir wpu 2> /dev/null

echo "wpu/ wpu/de/" | xargs -n 1 cp -v easyepg/wpu/wpu.sh 2> /dev/null
echo "wpu/ wpu/de/" | xargs -n 1 cp -v easyepg/wpu/settings.sh 2> /dev/null
echo "wpu/ wpu/de/" | xargs -n 1 cp -v easyepg/wpu/epg_json2xml.pl 2> /dev/null
echo "wpu/ wpu/de/" | xargs -n 1 cp -v easyepg/wpu/ch_json2xml.pl 2> /dev/null
echo "wpu/ wpu/de/" | xargs -n 1 cp -v easyepg/wpu/cid_json.pl 2> /dev/null
echo "wpu/ wpu/de/" | xargs -n 1 cp -v easyepg/wpu/chlist_printer.pl 2> /dev/null
echo "wpu/ wpu/de/" | xargs -n 1 cp -v easyepg/wpu/compare_menu.pl 2> /dev/null

# TV-Spielfilm
echo "Updating TV-Spielfilm..."

mkdir tvs 2> /dev/null

echo "tvs/ tvs/de/" | xargs -n 1 cp -v easyepg/tvs/tvs.sh 2> /dev/null
echo "tvs/ tvs/de/" | xargs -n 1 cp -v easyepg/tvs/settings.sh 2> /dev/null
echo "tvs/ tvs/de/" | xargs -n 1 cp -v easyepg/tvs/epg_json2xml.pl 2> /dev/null
echo "tvs/ tvs/de/" | xargs -n 1 cp -v easyepg/tvs/ch_json2xml.pl 2> /dev/null
echo "tvs/ tvs/de/" | xargs -n 1 cp -v easyepg/tvs/cid_json.pl 2> /dev/null
echo "tvs/ tvs/de/" | xargs -n 1 cp -v easyepg/tvs/chlist_printer.pl 2> /dev/null
echo "tvs/ tvs/de/" | xargs -n 1 cp -v easyepg/tvs/compare_menu.pl 2> /dev/null
echo "tvs/ tvs/de/" | xargs -n 1 cp -v easyepg/tvs/url_printer.pl 2> /dev/null

# VODAFONE
echo "Updating VODAFONE..."

mkdir vdf 2> /dev/null

echo "vdf/ vdf/de/" | xargs -n 1 cp -v easyepg/vdf/vdf.sh 2> /dev/null
echo "vdf/ vdf/de/" | xargs -n 1 cp -v easyepg/vdf/settings.sh 2> /dev/null
echo "vdf/ vdf/de/" | xargs -n 1 cp -v easyepg/vdf/epg_json2xml.pl 2> /dev/null
echo "vdf/ vdf/de/" | xargs -n 1 cp -v easyepg/vdf/ch_json2xml.pl 2> /dev/null
echo "vdf/ vdf/de/" | xargs -n 1 cp -v easyepg/vdf/compare_crid.pl 2> /dev/null
echo "vdf/ vdf/de/" | xargs -n 1 cp -v easyepg/vdf/cid_json.pl 2> /dev/null
echo "vdf/ vdf/de/" | xargs -n 1 cp -v easyepg/vdf/chlist_printer.pl 2> /dev/null
echo "vdf/ vdf/de/" | xargs -n 1 cp -v easyepg/vdf/compare_menu.pl 2> /dev/null
echo "vdf/ vdf/de/" | xargs -n 1 cp -v easyepg/vdf/url_printer.pl 2> /dev/null

# EXTERNAL
echo "Updating External..."

mkdir ext 2> /dev/null

echo "ext/ ext/oa/ ext/ob/ ext/oc/" | xargs -n 1 cp -v easyepg/ext/ext.sh 2> /dev/null
echo "ext/ ext/oa/ ext/ob/ ext/oc/" | xargs -n 1 cp -v easyepg/ext/settings.sh 2> /dev/null
echo "ext/ ext/oa/ ext/ob/ ext/oc/" | xargs -n 1 cp -v easyepg/ext/epg_ext.pl 2> /dev/null
echo "ext/ ext/oa/ ext/ob/ ext/oc/" | xargs -n 1 cp -v easyepg/ext/ch_ext.pl 2> /dev/null
echo "ext/ ext/oa/ ext/ob/ ext/oc/" | xargs -n 1 cp -v easyepg/ext/compare_menu.pl 2> /dev/null

echo "CLEAN"
rm -rf easyepg/

# DONE
echo "UPDATE FINISHED! --> Branch TESTING"
Loading

0 comments on commit fbd5db1

Please sign in to comment.