Compare commits
91 Commits
c073fa3e69
...
vorbereitu
| Author | SHA1 | Date | |
|---|---|---|---|
| c39fd73850 | |||
| a683bc6eda | |||
| d66865093b | |||
| f21f024612 | |||
| 18ef7c4a76 | |||
| 7bcf969ecf | |||
| f911cfd283 | |||
| e6b37d798e | |||
| 6842fe7416 | |||
| 6a268783e5 | |||
| 9ce4a1e25c | |||
| c5d9ad6493 | |||
| bac6f5d7b5 | |||
| 1cb16b14e0 | |||
1ed35086a8
|
|||
| d58b9204d3 | |||
| a01b0a6f87 | |||
| 3e41b2f809 | |||
| 2763b42ff2 | |||
| 8aabc564e3 | |||
| ddf0344d6f | |||
| a4b30b3121 | |||
| 95510b3181 | |||
| 1af2ff388e | |||
| 76c4701618 | |||
| 36c482cb43 | |||
| 034e39012c | |||
| c203ac7d0f | |||
| e6cc19e115 | |||
| 6ea43413ce | |||
| af08704d6d | |||
| 95b7255ea7 | |||
| 8016f87136 | |||
| 33ddbd7ce0 | |||
| 91db42b4b2 | |||
| 6a485e95de | |||
| 75e167f96e | |||
| 711bf8fb25 | |||
| 36e6d8fc4f | |||
| 2427928c3c | |||
| f0a9aa44a4 | |||
| ac9f4c86ca | |||
| 18e2c5db94 | |||
| 7fd4352798 | |||
| acf30adc5e | |||
| cb789aa34f | |||
| 36a0d74ac1 | |||
| 89d2812724 | |||
| d23139f5af | |||
| d5425192b6 | |||
| 8b25cd70b3 | |||
| 9f83afce3a | |||
| c958ed2632 | |||
| 583955df67 | |||
| a6a8ad436a | |||
| 33e9f2a3f2 | |||
| 6117764e42 | |||
| 55f23b4099 | |||
| 9443f5c372 | |||
| 1b9e55592f | |||
| 92e8e0946d | |||
| c272d9013d | |||
| 1dd56a5084 | |||
| 236c4ea33a | |||
| c8dc474476 | |||
| 8d87f21cce | |||
| 3c32455a12 | |||
| 8679da9be4 | |||
| f8178f1f7f | |||
| 2bc06c4027 | |||
| 24a06b54f3 | |||
| 0daa7cb254 | |||
| e40c1b54c8 | |||
| f4771cb2be | |||
| 760819d4e8 | |||
| e4ce5cbd84 | |||
| fa90fa90e9 | |||
| 9f2525e503 | |||
| cc62a9b139 | |||
| 2d27a8a6d4 | |||
| 2618ee154d | |||
| 4f5a45f096 | |||
| 3e7ae97312 | |||
| df2ca1901e | |||
| bb812c882b | |||
| 044b9e6834 | |||
| 8828b75917 | |||
| 4e4320c4a2 | |||
| 7013aeea3e | |||
| abc5bc57d4 | |||
| d7168d096f |
@@ -11,10 +11,8 @@ if [ -z $IFS ]; then
|
|||||||
IFS=$'\n'
|
IFS=$'\n'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
GIT_UPDATE_LOG=/opt/app/tools/atbupdate/update_log.csv
|
GIT_UPDATE_LOG=/opt/app/tools/atbupdate/update_log.csv
|
||||||
|
|
||||||
|
|
||||||
#TODO: use in UpdateController
|
#TODO: use in UpdateController
|
||||||
|
|
||||||
get_blob () { # get the blob of the file(name) passed as $1
|
get_blob () { # get the blob of the file(name) passed as $1
|
||||||
@@ -29,7 +27,6 @@ get_commit_for_blob () {
|
|||||||
grep -q $1 && echo -n {} && head -n 1")
|
grep -q $1 && echo -n {} && head -n 1")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
write_log_file () {
|
write_log_file () {
|
||||||
local now=$(date +"%Y-%m-%dT%T")
|
local now=$(date +"%Y-%m-%dT%T")
|
||||||
for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
|
for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
|
||||||
|
|||||||
35
.gitignore
vendored
35
.gitignore
vendored
@@ -1,27 +1,16 @@
|
|||||||
# First, ignore everything
|
|
||||||
*
|
*
|
||||||
# Now, whitelist anything that's a directory
|
|
||||||
!*/
|
|
||||||
# And all the file types you're interested in
|
|
||||||
!.gitignore
|
|
||||||
!.githooks/post-merge
|
|
||||||
!.githooks/post-checkout
|
|
||||||
!**/.gitignore
|
|
||||||
!**/.githooks/post-merge
|
|
||||||
!**/.githooks/post-checkout
|
|
||||||
|
|
||||||
## Except
|
## Except
|
||||||
!etc/atb/*
|
!**/.gitignore
|
||||||
!etc/psa_config/*
|
!**/.githooks/post-merge
|
||||||
!etc/psa_update/*
|
!/etc/*.ini
|
||||||
!etc/psa_tariff/*
|
!/etc/atb/*.ini
|
||||||
!etc/dc/*.hex
|
!/etc/psa_config/*
|
||||||
!etc/dc/*.bin
|
!/etc/psa_update/*
|
||||||
!*/etc/*.ini
|
!/etc/psa_tariff/*
|
||||||
!*/etc/atb/*
|
!/etc/dc/dc2c.hex
|
||||||
!*/etc/psa_config/*
|
|
||||||
!*/etc/psa_update/*
|
!/opt/app/ATBAPP/*.ini
|
||||||
!*/etc/psa_tariff/*
|
!/opt/app/sysconfig/*.ini
|
||||||
!*/etc/dc/*.hex
|
!/opt/app/ISMASMgr/*.ini
|
||||||
!*/etc/dc/*.bin
|
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
@@ -249,13 +249,6 @@
|
|||||||
"pedwt_time_to": "00:00:00",
|
"pedwt_time_to": "00:00:00",
|
||||||
"pedwt_price": 0
|
"pedwt_price": 0
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"pedwt_id": 2180,
|
|
||||||
"pedwt_period_exc_day_id": 15,
|
|
||||||
"pedwt_time_from": "00:00:00",
|
|
||||||
"pedwt_time_to": "00:00:00",
|
|
||||||
"pedwt_price": 0
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"pedwt_id": 2184,
|
"pedwt_id": 2184,
|
||||||
"pedwt_period_exc_day_id": 2021,
|
"pedwt_period_exc_day_id": 2021,
|
||||||
@@ -483,14 +476,6 @@
|
|||||||
"ped_period_special_day_id": 2,
|
"ped_period_special_day_id": 2,
|
||||||
"ped_year": 0
|
"ped_year": 0
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"ped_id": 15,
|
|
||||||
"ped_label": "Republic Day (Hungary)",
|
|
||||||
"ped_date_start": "2025-10-24",
|
|
||||||
"ped_date_end": "2025-10-24",
|
|
||||||
"ped_period_special_day_id": 2,
|
|
||||||
"ped_year": 0
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"ped_id": 2022,
|
"ped_id": 2022,
|
||||||
"ped_label": "NewYear",
|
"ped_label": "NewYear",
|
||||||
|
|||||||
@@ -248,13 +248,6 @@
|
|||||||
"pedwt_time_from": "00:00:00",
|
"pedwt_time_from": "00:00:00",
|
||||||
"pedwt_time_to": "00:00:00",
|
"pedwt_time_to": "00:00:00",
|
||||||
"pedwt_price": 0
|
"pedwt_price": 0
|
||||||
},
|
|
||||||
{
|
|
||||||
"pedwt_id": 2180,
|
|
||||||
"pedwt_period_exc_day_id": 15,
|
|
||||||
"pedwt_time_from": "00:00:00",
|
|
||||||
"pedwt_time_to": "00:00:00",
|
|
||||||
"pedwt_price": 0
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"pedwt_id": 2184,
|
"pedwt_id": 2184,
|
||||||
@@ -482,14 +475,6 @@
|
|||||||
"ped_date_end": "2025-10-23",
|
"ped_date_end": "2025-10-23",
|
||||||
"ped_period_special_day_id": 2,
|
"ped_period_special_day_id": 2,
|
||||||
"ped_year": 0
|
"ped_year": 0
|
||||||
},
|
|
||||||
{
|
|
||||||
"ped_id": 15,
|
|
||||||
"ped_label": "Republic Day (Hungary)",
|
|
||||||
"ped_date_start": "2025-10-24",
|
|
||||||
"ped_date_end": "2025-10-24",
|
|
||||||
"ped_period_special_day_id": 2,
|
|
||||||
"ped_year": 0
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ped_id": 2022,
|
"ped_id": 2022,
|
||||||
|
|||||||
@@ -103,6 +103,13 @@
|
|||||||
"pwd_period_day_in_week_id": 5,
|
"pwd_period_day_in_week_id": 5,
|
||||||
"pwd_time_from": "08:00:00",
|
"pwd_time_from": "08:00:00",
|
||||||
"pwd_time_to": "18:00:00"
|
"pwd_time_to": "18:00:00"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"pwd_id": 636,
|
||||||
|
"pwd_period_week_day_id": 37,
|
||||||
|
"pwd_period_day_in_week_id": 6,
|
||||||
|
"pwd_time_from": "08:00:00",
|
||||||
|
"pwd_time_to": "12:00:00"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"PeriodYear": [
|
"PeriodYear": [
|
||||||
@@ -248,13 +255,6 @@
|
|||||||
"pedwt_time_from": "00:00:00",
|
"pedwt_time_from": "00:00:00",
|
||||||
"pedwt_time_to": "00:00:00",
|
"pedwt_time_to": "00:00:00",
|
||||||
"pedwt_price": 0
|
"pedwt_price": 0
|
||||||
},
|
|
||||||
{
|
|
||||||
"pedwt_id": 2180,
|
|
||||||
"pedwt_period_exc_day_id": 15,
|
|
||||||
"pedwt_time_from": "00:00:00",
|
|
||||||
"pedwt_time_to": "00:00:00",
|
|
||||||
"pedwt_price": 0
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"pedwt_id": 2184,
|
"pedwt_id": 2184,
|
||||||
@@ -482,14 +482,6 @@
|
|||||||
"ped_date_end": "2025-10-23",
|
"ped_date_end": "2025-10-23",
|
||||||
"ped_period_special_day_id": 2,
|
"ped_period_special_day_id": 2,
|
||||||
"ped_year": 0
|
"ped_year": 0
|
||||||
},
|
|
||||||
{
|
|
||||||
"ped_id": 15,
|
|
||||||
"ped_label": "Republic Day (Hungary)",
|
|
||||||
"ped_date_start": "2025-10-24",
|
|
||||||
"ped_date_end": "2025-10-24",
|
|
||||||
"ped_period_special_day_id": 2,
|
|
||||||
"ped_year": 0
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ped_id": 2022,
|
"ped_id": 2022,
|
||||||
|
|||||||
@@ -270,13 +270,6 @@
|
|||||||
"pedwt_time_from": "00:00:00",
|
"pedwt_time_from": "00:00:00",
|
||||||
"pedwt_time_to": "00:00:00",
|
"pedwt_time_to": "00:00:00",
|
||||||
"pedwt_price": 0
|
"pedwt_price": 0
|
||||||
},
|
|
||||||
{
|
|
||||||
"pedwt_id": 2180,
|
|
||||||
"pedwt_period_exc_day_id": 15,
|
|
||||||
"pedwt_time_from": "00:00:00",
|
|
||||||
"pedwt_time_to": "00:00:00",
|
|
||||||
"pedwt_price": 0
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"pedwt_id": 2184,
|
"pedwt_id": 2184,
|
||||||
@@ -645,15 +638,8 @@
|
|||||||
"ped_period_special_day_id": 2,
|
"ped_period_special_day_id": 2,
|
||||||
"ped_year": 0
|
"ped_year": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ped_id": 15,
|
"ped_id": 2022,
|
||||||
"ped_label": "Republic Day (Hungary)",
|
|
||||||
"ped_date_start": "2025-10-24",
|
|
||||||
"ped_date_end": "2025-10-24",
|
|
||||||
"ped_period_special_day_id": 2,
|
|
||||||
"ped_year": 0
|
|
||||||
},
|
|
||||||
{"ped_id": 2022,
|
|
||||||
"ped_label": "NewYear",
|
"ped_label": "NewYear",
|
||||||
"ped_date_start": "2025-01-01",
|
"ped_date_start": "2025-01-01",
|
||||||
"ped_date_end": "2025-01-01",
|
"ped_date_end": "2025-01-01",
|
||||||
|
|||||||
@@ -277,20 +277,6 @@
|
|||||||
"pedwt_time_from": "00:00:00",
|
"pedwt_time_from": "00:00:00",
|
||||||
"pedwt_time_to": "00:00:00",
|
"pedwt_time_to": "00:00:00",
|
||||||
"pedwt_price": 0
|
"pedwt_price": 0
|
||||||
},
|
|
||||||
{
|
|
||||||
"pedwt_id": 2180,
|
|
||||||
"pedwt_period_exc_day_id": 15,
|
|
||||||
"pedwt_time_from": "00:00:00",
|
|
||||||
"pedwt_time_to": "00:00:00",
|
|
||||||
"pedwt_price": 0
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"pedwt_id": 2180,
|
|
||||||
"pedwt_period_exc_day_id": 16,
|
|
||||||
"pedwt_time_from": "00:00:00",
|
|
||||||
"pedwt_time_to": "00:00:00",
|
|
||||||
"pedwt_price": 0
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"pedwt_id": 2184,
|
"pedwt_id": 2184,
|
||||||
@@ -658,14 +644,6 @@
|
|||||||
"ped_date_end": "2025-10-23",
|
"ped_date_end": "2025-10-23",
|
||||||
"ped_period_special_day_id": 2,
|
"ped_period_special_day_id": 2,
|
||||||
"ped_year": 0
|
"ped_year": 0
|
||||||
},
|
|
||||||
{
|
|
||||||
"ped_id": 15,
|
|
||||||
"ped_label": "Republic Day (Hungary)",
|
|
||||||
"ped_date_start": "2025-10-24",
|
|
||||||
"ped_date_end": "2025-10-24",
|
|
||||||
"ped_period_special_day_id": 2,
|
|
||||||
"ped_year": 0
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ped_id": 2022,
|
"ped_id": 2022,
|
||||||
@@ -748,8 +726,8 @@
|
|||||||
"ped_year": 0
|
"ped_year": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ped_id": 16,
|
"ped_id": 2032,
|
||||||
"ped_label": "Saints Day",
|
"ped_label": "All Saints Day",
|
||||||
"ped_date_start": "2025-11-01",
|
"ped_date_start": "2025-11-01",
|
||||||
"ped_date_end": "2025-11-01",
|
"ped_date_end": "2025-11-01",
|
||||||
"ped_period_special_day_id": 2,
|
"ped_period_special_day_id": 2,
|
||||||
|
|||||||
@@ -277,20 +277,6 @@
|
|||||||
"pedwt_time_from": "00:00:00",
|
"pedwt_time_from": "00:00:00",
|
||||||
"pedwt_time_to": "00:00:00",
|
"pedwt_time_to": "00:00:00",
|
||||||
"pedwt_price": 0
|
"pedwt_price": 0
|
||||||
},
|
|
||||||
{
|
|
||||||
"pedwt_id": 2180,
|
|
||||||
"pedwt_period_exc_day_id": 15,
|
|
||||||
"pedwt_time_from": "00:00:00",
|
|
||||||
"pedwt_time_to": "00:00:00",
|
|
||||||
"pedwt_price": 0
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"pedwt_id": 2180,
|
|
||||||
"pedwt_period_exc_day_id": 16,
|
|
||||||
"pedwt_time_from": "00:00:00",
|
|
||||||
"pedwt_time_to": "00:00:00",
|
|
||||||
"pedwt_price": 0
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"pedwt_id": 2184,
|
"pedwt_id": 2184,
|
||||||
@@ -658,14 +644,6 @@
|
|||||||
"ped_date_end": "2025-10-23",
|
"ped_date_end": "2025-10-23",
|
||||||
"ped_period_special_day_id": 2,
|
"ped_period_special_day_id": 2,
|
||||||
"ped_year": 0
|
"ped_year": 0
|
||||||
},
|
|
||||||
{
|
|
||||||
"ped_id": 15,
|
|
||||||
"ped_label": "Republic Day (Hungary)",
|
|
||||||
"ped_date_start": "2025-10-24",
|
|
||||||
"ped_date_end": "2025-10-24",
|
|
||||||
"ped_period_special_day_id": 2,
|
|
||||||
"ped_year": 0
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ped_id": 2022,
|
"ped_id": 2022,
|
||||||
@@ -748,8 +726,8 @@
|
|||||||
"ped_year": 0
|
"ped_year": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ped_id": 16,
|
"ped_id": 2032,
|
||||||
"ped_label": "Saints Day",
|
"ped_label": "All Saints Day",
|
||||||
"ped_date_start": "2025-11-01",
|
"ped_date_start": "2025-11-01",
|
||||||
"ped_date_end": "2025-11-01",
|
"ped_date_end": "2025-11-01",
|
||||||
"ped_period_special_day_id": 2,
|
"ped_period_special_day_id": 2,
|
||||||
|
|||||||
@@ -5,14 +5,14 @@
|
|||||||
###############################################################################
|
###############################################################################
|
||||||
##
|
##
|
||||||
opkg update
|
opkg update
|
||||||
# opkg install prepare-update
|
opkg install prepare-update
|
||||||
# download packages
|
# download packages
|
||||||
# opkg --cache /var/cache/opkg --download-only upgrade tariff-config-281
|
opkg --cache /var/cache/opkg --download-only upgrade tariff-config-281
|
||||||
# opkg --cache /var/cache/opkg --download-only upgrade libmobilisis-calc2
|
opkg --cache /var/cache/opkg --download-only upgrade libmobilisis-calc2
|
||||||
# opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-calculateprice-mobilisis
|
opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-calculateprice-mobilisis
|
||||||
opkg --cache /var/cache/opkg --download-only upgrade atbqt=4.99.9+git0+fa9d02636f-r0
|
opkg --cache /var/cache/opkg --download-only upgrade atbqt
|
||||||
# install packages
|
# install packages
|
||||||
# opkg --cache /var/cache/opkg upgrade tariff-config-281
|
opkg --cache /var/cache/opkg upgrade tariff-config-281
|
||||||
# opkg --cache /var/cache/opkg upgrade libmobilisis-calc2
|
opkg --cache /var/cache/opkg upgrade libmobilisis-calc2
|
||||||
# opkg --cache /var/cache/opkg upgrade atb-plugin-calculateprice-mobilisis
|
opkg --cache /var/cache/opkg upgrade atb-plugin-calculateprice-mobilisis
|
||||||
opkg --cache /var/cache/opkg upgrade atbqt=4.99.9+git0+fa9d02636f-r0
|
opkg --cache /var/cache/opkg upgrade atbqt
|
||||||
|
|||||||
Reference in New Issue
Block a user