summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO114
-rw-r--r--PKGBUILD29
2 files changed, 68 insertions, 75 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e13be298d054..604ec7167d12 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
pkgbase = idos-timetable-data-inprop-mhd-sk-all-latest
pkgdesc = Public transport data of many Slovak cities for the IDOS timetable browser, data provided by INPROP.
- pkgver = 2019_5_27
+ pkgver = 2019_8_28
pkgrel = 1
epoch = 0
- url = http://www.inprop.sk/download.aspx
+ url = https://www.inprop.eu/Home/Downloads
arch = any
groups = idos-timetable
license = custom
@@ -12,11 +12,11 @@ pkgbase = idos-timetable-data-inprop-mhd-sk-all-latest
depends = idos-timetable-browser
optdepends = idos-timetable-tariff-mhd: For showing prices.
optdepends = idos-timetable-maps-mhd: For displaying routes.
- provides = idos-timetable-data-inprop-mhd-sk-all=2019_5_27
- provides = idos-timetable-data=2019_5_27
- provides = idos-timetable-data-mhd=2019_5_27
- provides = idos-timetable-data-mhd-sk=2019_5_27
- provides = idos-timetable-data-mhd-sk-all=2019_5_27
+ provides = idos-timetable-data-inprop-mhd-sk-all=2019_8_28
+ provides = idos-timetable-data=2019_8_28
+ provides = idos-timetable-data-mhd=2019_8_28
+ provides = idos-timetable-data-mhd-sk=2019_8_28
+ provides = idos-timetable-data-mhd-sk-all=2019_8_28
conflicts = idos-timetable-data-inprop-mhd-sk-all
conflicts = idos-timetable-data-mhd-banskabystrica
conflicts = idos-timetable-data-mhd-bratislava
@@ -25,56 +25,56 @@ pkgbase = idos-timetable-data-inprop-mhd-sk-all-latest
conflicts = idos-timetable-data-mhd-povazskabystrica
conflicts = idos-timetable-data-mhd-presov
conflicts = idos-timetable-data-mhd-puchov
- source = http://www.inprop.sk/Data/MDBbSk.exe
- source = http://www.inprop.sk/Data/MDBjSk.exe
- source = http://www.inprop.sk/Data/MDBnSk.exe
- source = http://www.inprop.sk/Data/MDBaSk.exe
- source = http://www.inprop.sk/Data/MDBrSk.exe
- source = http://www.inprop.sk/Data/MDCaSk.exe
- source = http://www.inprop.sk/Data/MDDkSk.exe
- source = http://www.inprop.sk/Data/MDDsSk.exe
- source = http://www.inprop.sk/Data/MDGaSk.exe
- source = http://www.inprop.sk/Data/MDHaSk.exe
- source = http://www.inprop.sk/Data/MDHcSk.exe
- source = http://www.inprop.sk/Data/MDHeSk.exe
- source = http://www.inprop.sk/Data/MDKnSk.exe
- source = http://www.inprop.sk/Data/MDKoSk.exe
- source = http://www.inprop.sk/Data/MDKkSk.exe
- source = http://www.inprop.sk/Data/MDKnmSk.exe
- source = http://www.inprop.sk/Data/MDLeSk.exe
- source = http://www.inprop.sk/Data/MDLvSk.exe
- source = http://www.inprop.sk/Data/MDLMSk.exe
- source = http://www.inprop.sk/Data/MDLcSk.exe
- source = http://www.inprop.sk/Data/MDMiSk.exe
- source = http://www.inprop.sk/Data/MDMtSk.exe
- source = http://www.inprop.sk/Data/MDNRSk.exe
- source = http://www.inprop.sk/Data/MDNMSk.exe
- source = http://www.inprop.sk/Data/MDNZSk.exe
- source = http://www.inprop.sk/Data/MDPeSk.exe
- source = http://www.inprop.sk/Data/MDPnSk.exe
- source = http://www.inprop.sk/Data/MDPbSk.exe
- source = http://www.inprop.sk/Data/MDPpSk.exe
- source = http://www.inprop.sk/Data/MDPoSk.exe
- source = http://www.inprop.sk/Data/MDPdSk.exe
- source = http://www.inprop.sk/Data/MDRsSk.exe
- source = http://www.inprop.sk/Data/MDRkSk.exe
- source = http://www.inprop.sk/Data/MDShSk.exe
- source = http://www.inprop.sk/Data/MDSeSk.exe
- source = http://www.inprop.sk/Data/MDSnSk.exe
- source = http://www.inprop.sk/Data/MDSrSk.exe
- source = http://www.inprop.sk/Data/MDSvSk.exe
- source = http://www.inprop.sk/Data/MDSaSk.exe
- source = http://www.inprop.sk/Data/MDSiSk.exe
- source = http://www.inprop.sk/Data/MDNZStSk.exe
- source = http://www.inprop.sk/Data/MDNZSuSk.exe
- source = http://www.inprop.sk/Data/MDTvSk.exe
- source = http://www.inprop.sk/Data/MDTnSk.exe
- source = http://www.inprop.sk/Data/MDTtSk.exe
- source = http://www.inprop.sk/Data/MDToSk.exe
- source = http://www.inprop.sk/Data/MDVtSk.exe
- source = http://www.inprop.sk/Data/MDZvSk.exe
- source = http://www.inprop.sk/Data/MDZHSk.exe
- source = http://www.inprop.sk/Data/MDZaSk.exe
+ source = 13.exe::https://www.inprop.eu/Home/DownloadFile/13
+ source = 14.exe::https://www.inprop.eu/Home/DownloadFile/14
+ source = 16.exe::https://www.inprop.eu/Home/DownloadFile/16
+ source = 17.exe::https://www.inprop.eu/Home/DownloadFile/17
+ source = 18.exe::https://www.inprop.eu/Home/DownloadFile/18
+ source = 19.exe::https://www.inprop.eu/Home/DownloadFile/19
+ source = 20.exe::https://www.inprop.eu/Home/DownloadFile/20
+ source = 21.exe::https://www.inprop.eu/Home/DownloadFile/21
+ source = 22.exe::https://www.inprop.eu/Home/DownloadFile/22
+ source = 23.exe::https://www.inprop.eu/Home/DownloadFile/23
+ source = 24.exe::https://www.inprop.eu/Home/DownloadFile/24
+ source = 25.exe::https://www.inprop.eu/Home/DownloadFile/25
+ source = 28.exe::https://www.inprop.eu/Home/DownloadFile/28
+ source = 26.exe::https://www.inprop.eu/Home/DownloadFile/26
+ source = 27.exe::https://www.inprop.eu/Home/DownloadFile/27
+ source = 29.exe::https://www.inprop.eu/Home/DownloadFile/29
+ source = 31.exe::https://www.inprop.eu/Home/DownloadFile/31
+ source = 30.exe::https://www.inprop.eu/Home/DownloadFile/30
+ source = 32.exe::https://www.inprop.eu/Home/DownloadFile/32
+ source = 33.exe::https://www.inprop.eu/Home/DownloadFile/33
+ source = 35.exe::https://www.inprop.eu/Home/DownloadFile/35
+ source = 34.exe::https://www.inprop.eu/Home/DownloadFile/34
+ source = 36.exe::https://www.inprop.eu/Home/DownloadFile/36
+ source = 37.exe::https://www.inprop.eu/Home/DownloadFile/37
+ source = 38.exe::https://www.inprop.eu/Home/DownloadFile/38
+ source = 39.exe::https://www.inprop.eu/Home/DownloadFile/39
+ source = 40.exe::https://www.inprop.eu/Home/DownloadFile/40
+ source = 42.exe::https://www.inprop.eu/Home/DownloadFile/42
+ source = 41.exe::https://www.inprop.eu/Home/DownloadFile/41
+ source = 44.exe::https://www.inprop.eu/Home/DownloadFile/44
+ source = 43.exe::https://www.inprop.eu/Home/DownloadFile/43
+ source = 45.exe::https://www.inprop.eu/Home/DownloadFile/45
+ source = 46.exe::https://www.inprop.eu/Home/DownloadFile/46
+ source = 48.exe::https://www.inprop.eu/Home/DownloadFile/48
+ source = 50.exe::https://www.inprop.eu/Home/DownloadFile/50
+ source = 53.exe::https://www.inprop.eu/Home/DownloadFile/53
+ source = 49.exe::https://www.inprop.eu/Home/DownloadFile/49
+ source = 51.exe::https://www.inprop.eu/Home/DownloadFile/51
+ source = 47.exe::https://www.inprop.eu/Home/DownloadFile/47
+ source = 52.exe::https://www.inprop.eu/Home/DownloadFile/52
+ source = 54.exe::https://www.inprop.eu/Home/DownloadFile/54
+ source = 55.exe::https://www.inprop.eu/Home/DownloadFile/55
+ source = 59.exe::https://www.inprop.eu/Home/DownloadFile/59
+ source = 56.exe::https://www.inprop.eu/Home/DownloadFile/56
+ source = 57.exe::https://www.inprop.eu/Home/DownloadFile/57
+ source = 58.exe::https://www.inprop.eu/Home/DownloadFile/58
+ source = 60.exe::https://www.inprop.eu/Home/DownloadFile/60
+ source = 61.exe::https://www.inprop.eu/Home/DownloadFile/61
+ source = 62.exe::https://www.inprop.eu/Home/DownloadFile/62
+ source = 63.exe::https://www.inprop.eu/Home/DownloadFile/63
source = license-dummy.txt
sha256sums = SKIP
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index b4d257793da0..38b9c78a7a09 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,11 +5,11 @@
_pkgname=idos-timetable-data-inprop-mhd-sk-all
pkgname="${_pkgname}-latest"
epoch=0
-pkgver=2019_5_27
+pkgver=2019_8_28
pkgrel=1
pkgdesc="Public transport data of many Slovak cities for the IDOS timetable browser, data provided by INPROP."
arch=(any)
-url="http://www.inprop.sk/download.aspx"
+url="https://www.inprop.eu/Home/Downloads"
license=('custom')
groups=(
@@ -52,8 +52,8 @@ conflicts=(
)
_list_sources() {
- wget -nv -O- "${url}" | grep --text \.exe | sed -r 's|(Data/[a-zA-Z0-9]*\.exe)|\n\1\n|g' | grep -E 'Data/MD[a-zA-Z0-9]*\.exe' | while read line; do
- echo "$(dirname "${url}")/${line}"
+ wget -nv -O- "${url}" | tr -d '\a' | tr '\n' '\a' | sed -E -e 's|<tr>|\n|g' -e 's|</tr>|\n|g' | grep -E '<span.*>MHD' | sed 's|^.*href="/Home/\(DownloadFile/[^"]*\)".*$|\1|g' | while read _line; do
+ echo "$(basename "${_line}").exe::$(dirname "${url}")/${_line}"
done
}
@@ -67,10 +67,7 @@ source=(
sha256sums=()
for i in $(seq 1 ${#_sources[@]}); do
- sha256sums=(
- "${sha256sums[@]}"
- 'SKIP'
- )
+ sha256sums+=('SKIP')
done
sha256sums=(
@@ -80,7 +77,7 @@ sha256sums=(
pkgver() {
# Use the version of the newest updated file.
- wget -nv -O- "${url}" | grep --text -E 'Data/MD[a-zA-Z0-9]*\.exe' | sed -r 's|[^0-9]([0-9]{1,2}\.[0-9]{1,2}\.[0-9]{4})[^0-9]|\n\1\n|' | grep --text -E '^[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{4}$' | awk -F. '{print $3"_"$2"_"$1}' | sort -Vr | head -n 1
+ wget -nv -O- "${url}" | tr -d '\a' | tr '\n' '\a' | sed -E -e 's|<tr>|\n|g' -e 's|</tr>|\n|g' | grep -E '<span.*>MHD' | sed -E 's|^.*Updated:.*<span>([0-9]+/[0-9]+/[0-9]+).*$|\1|g' | awk -F/ '{print $3"_"$1"_"$2}' | sort -Vr | head -n1
}
@@ -90,15 +87,11 @@ package() {
install -d -m755 "${_instdir}"
- cd "${_instdir}" && {
- for _file in "${_sources[@]}"; do
- _sourcefile="$(basename "${_file}")"
- 7z x "${srcdir}/${_sourcefile}"
- done
- chmod 755 Data*
- chmod 644 Data*/*
- }
-
+ cp -av "${srcdir}"/Data* "${_instdir}"/
+
+ chmod 755 "${_instdir}"/Data*
+ chmod 644 "${_instdir}"/Data*/*
+
install -d -m755 "${pkgdir}/usr/share/doc/${_pkgname}"
echo "${url}" > "${pkgdir}/usr/share/doc/${_pkgname}/info.url"
chmod 644 "${pkgdir}/usr/share/doc/${_pkgname}/info.url"