Compare commits
229 Commits
vorbereitu
...
zg1/zone2
Author | SHA1 | Date | |
---|---|---|---|
de4775b25b | |||
ad69e5d3d9 | |||
e271588861 | |||
2008f023d3 | |||
a04cb8c3b2 | |||
3b45a157a7 | |||
36b3c0a7f1 | |||
4e4274bb95 | |||
c53504b14d | |||
1a6c5836bc | |||
4e64df50d7 | |||
c4dd836ee3 | |||
cab404e238 | |||
84b2b1ca27 | |||
e245ae27a0 | |||
4f5fcfe7b5 | |||
caa7030a97 | |||
3657e299b3
|
|||
bad9bb1103
|
|||
acc80f2c04 | |||
503e355667 | |||
6cad56650b | |||
6318b15756 | |||
a523fe72c3 | |||
8fde0a4f4d | |||
cb7a17cdad | |||
2702208167 | |||
2c0fd877ab | |||
59cd4bfb7e | |||
0cfd6b7071 | |||
443961ca5d | |||
c2c21df05a | |||
053d554c45 | |||
048ef21538 | |||
19b8b6ba28 | |||
1e2b4bcc7d | |||
aa32676431 | |||
a9b9fd75bf | |||
60a375a773 | |||
b4c50748ba | |||
c3c07329b6 | |||
d14dc38340 | |||
ecabc589d8 | |||
6e756202d7 | |||
d478ce44ab | |||
1746b94678 | |||
1f54b1ec90 | |||
e1c39f1df6 | |||
2d65b9ba14
|
|||
38386d7aed
|
|||
e9dc8f6e10 | |||
2cc7ec9dc7 | |||
25e9e014de | |||
0657b3ea27 | |||
5629444870 | |||
9461dfafb0 | |||
5a25611a39 | |||
73f5bfd568 | |||
4331c32dc5 | |||
23e5e1339e | |||
5d9882c569 | |||
6ed893f3fc | |||
69e3fbe55a | |||
d72bafb8d7 | |||
0b7614c2d9 | |||
de0b5a3e70 | |||
e9fa1e6dd5 | |||
ee0a06ba0b | |||
96a1db1fba | |||
1071e8e762 | |||
794c26ee97 | |||
8211505d34
|
|||
1c08df6da1
|
|||
031c9653f1
|
|||
9643f36c1d
|
|||
d6ef0ac4a6
|
|||
bf5bce2be8
|
|||
ef12748e72
|
|||
6a47b52c24
|
|||
cebda53e85 | |||
8b5f310464 | |||
db54f86be9 | |||
cf5b677bfe | |||
d25e6232e0 | |||
8949d1850c | |||
22d1a9f8a1 | |||
ee70081ab3
|
|||
a5f76131ff
|
|||
7ed84450e2
|
|||
8b58d78cd8
|
|||
fe7c8bf282
|
|||
8fdb94ac90
|
|||
ad987e5be6
|
|||
1e629e5fea | |||
7939f576a0 | |||
bbd39fbccb | |||
936e3f4dac
|
|||
9566a0793c
|
|||
1ce636908f
|
|||
338e36c5e6 | |||
279bcc009f | |||
ac77c0d08a | |||
db1b9ac700 | |||
8d8cc811c6 | |||
bbdde459b6 | |||
94b9cec72c | |||
4a1bc704e5
|
|||
8766a0bd86 | |||
fe56c2c73e | |||
0e8aa33feb | |||
6e7501e54c | |||
c0deb2d4a0 | |||
24f5ae1696 | |||
609cf8bc3c | |||
79e823df52 | |||
74edb5e88a | |||
f342d81db2 | |||
2e09b19564 | |||
7a0950e004 | |||
faf1b68ce9 | |||
47c6a9fdb0 | |||
14b26aa8fa | |||
72ecd841df | |||
97abd39097 | |||
050deba0bd | |||
a7df379b6c | |||
70e3028978 | |||
103f66f044 | |||
8729683fca | |||
12d1458bcb | |||
7db36e8de4 | |||
b6137a41f2 | |||
5939060c69 | |||
e0d813b34a | |||
affc74e711 | |||
13942e34f3 | |||
d3847df593 | |||
a9cb3b53f4 | |||
346247b88a | |||
5c89c49f08 | |||
6b6313d429 | |||
4d698ffb79 | |||
e83e1589fb | |||
0aaeaa7350 | |||
7d0cebe0ff | |||
bf5709d053 | |||
b22b3b31ee | |||
b4998ffe48 | |||
c94b276be0 | |||
505911ef5b | |||
794229660c | |||
13cfbb4932 | |||
4bf9efcf3a | |||
981dade375 | |||
3e1cf3c4e3 | |||
be84634d62
|
|||
f33d45d082
|
|||
a6862f566a
|
|||
64937d6fb4 | |||
dc68633378 | |||
61c9253239 | |||
6acc53275d | |||
378de9200c | |||
4a3ac32724 | |||
0fbea3a260 | |||
123291a2c2 | |||
cca3484256 | |||
5beba99abb | |||
13b3af1f92 | |||
6de220b8ba | |||
009b5c0170 | |||
fb2d0cf506 | |||
22b1efd66e | |||
abf75d636b | |||
b6a999e014 | |||
dcc7397232 | |||
f248f3f85f | |||
93ba8215b9 | |||
cd85b2c6e9 | |||
0f5c66fccc
|
|||
58e833b3a6
|
|||
48a299002c
|
|||
91130d96f0
|
|||
b115f3dfb8
|
|||
76c4663d8f
|
|||
7462ce9e12
|
|||
1480313fd0 | |||
a17bcb8b17
|
|||
469ecbc482
|
|||
273e6a8422 | |||
1bfbfbb670 | |||
87af143cbd | |||
4071d8ea14 | |||
f383f8282e | |||
2bcc19f9f6 | |||
e46c1f272b | |||
094fc2ef9a | |||
ba690aea25 | |||
5b57d0704c | |||
cc75917193 | |||
5f3a7608ba | |||
b6b37ec0c0 | |||
8a64c8bcdc | |||
d0574c6574 | |||
ef1b9e6add | |||
ef5bb0e182 | |||
3c97eaf7d8 | |||
5293268086 | |||
73fbc3d5ad | |||
d96a34d875 | |||
4d48b9bcc3 | |||
8c736577fe | |||
9b2d7c77f6 | |||
998c44fd5c | |||
05fe40a2e6 | |||
040f15bc0e | |||
80e38a8482 | |||
731dfcf961 | |||
a668dfbe3f | |||
26d3c61c7d | |||
bbd6566772 | |||
ce9ecc509c | |||
ad110349d8 | |||
50c5549834 | |||
59840c6db9 | |||
621a8ac361 | |||
9ca0a00763 | |||
09633c3754 | |||
5c85a294d5 |
@@ -11,8 +11,10 @@ if [ -z $IFS ]; then
|
||||
IFS=$'\n'
|
||||
fi
|
||||
|
||||
|
||||
GIT_UPDATE_LOG=/opt/app/tools/atbupdate/update_log.csv
|
||||
|
||||
|
||||
#TODO: use in UpdateController
|
||||
|
||||
get_blob () { # get the blob of the file(name) passed as $1
|
||||
@@ -27,6 +29,7 @@ get_commit_for_blob () {
|
||||
grep -q $1 && echo -n {} && head -n 1")
|
||||
}
|
||||
|
||||
|
||||
write_log_file () {
|
||||
local now=$(date +"%Y-%m-%dT%T")
|
||||
for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
|
||||
|
33
.gitignore
vendored
33
.gitignore
vendored
@@ -1,16 +1,27 @@
|
||||
# First, ignore everything
|
||||
*
|
||||
|
||||
## Except
|
||||
# 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
|
||||
!/etc/*.ini
|
||||
!/etc/atb/*.ini
|
||||
!/etc/psa_config/*
|
||||
!/etc/psa_update/*
|
||||
!/etc/psa_tariff/*
|
||||
!/etc/dc/dc2c.hex
|
||||
!**/.githooks/post-checkout
|
||||
|
||||
!/opt/app/ATBAPP/*.ini
|
||||
!/opt/app/sysconfig/*.ini
|
||||
!/opt/app/ISMASMgr/*.ini
|
||||
## Except
|
||||
!etc/atb/*
|
||||
!etc/psa_config/*
|
||||
!etc/psa_update/*
|
||||
!etc/psa_tariff/*
|
||||
!etc/dc/*.hex
|
||||
!etc/dc/*.bin
|
||||
!*/etc/*.ini
|
||||
!*/etc/atb/*
|
||||
!*/etc/psa_config/*
|
||||
!*/etc/psa_update/*
|
||||
!*/etc/psa_tariff/*
|
||||
!*/etc/dc/*.hex
|
||||
!*/etc/dc/*.bin
|
||||
|
||||
|
BIN
etc/psa_tariff/.tariff04.json.swp
Normal file
BIN
etc/psa_tariff/.tariff04.json.swp
Normal file
Binary file not shown.
@@ -103,13 +103,6 @@
|
||||
"pwd_period_day_in_week_id": 5,
|
||||
"pwd_time_from": "08: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": [
|
||||
|
@@ -4,15 +4,15 @@
|
||||
# opkg-commands added to this file will be executed by ATBUpdateTool.
|
||||
###############################################################################
|
||||
##
|
||||
opkg update
|
||||
opkg install prepare-update
|
||||
# opkg update
|
||||
# opkg install prepare-update
|
||||
# download packages
|
||||
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 atb-plugin-calculateprice-mobilisis
|
||||
opkg --cache /var/cache/opkg --download-only upgrade atbqt
|
||||
# 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 atb-plugin-calculateprice-mobilisis
|
||||
# opkg --cache /var/cache/opkg --download-only upgrade atbqt
|
||||
# install packages
|
||||
opkg --cache /var/cache/opkg upgrade tariff-config-281
|
||||
opkg --cache /var/cache/opkg upgrade libmobilisis-calc2
|
||||
opkg --cache /var/cache/opkg upgrade atb-plugin-calculateprice-mobilisis
|
||||
opkg --cache /var/cache/opkg upgrade atbqt
|
||||
# opkg --cache /var/cache/opkg upgrade tariff-config-281
|
||||
# opkg --cache /var/cache/opkg upgrade libmobilisis-calc2
|
||||
# opkg --cache /var/cache/opkg upgrade atb-plugin-calculateprice-mobilisis
|
||||
# opkg --cache /var/cache/opkg upgrade atbqt
|
||||
|
Reference in New Issue
Block a user