Compare commits
113 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
c073fa3e69
|
|||
| bf2a981be0 | |||
| 7a3bafffcd | |||
| 3bb2fff978 | |||
| a82310dac0 | |||
| bf4b0f26d4 | |||
| 953c4d85f4 | |||
| 281694d589 | |||
| 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
|
|||
| 1e629e5fea | |||
| 7939f576a0 | |||
| bbd39fbccb | |||
| 8d8cc811c6 | |||
| 4d698ffb79 | |||
| e83e1589fb | |||
| 4bf9efcf3a | |||
|
be84634d62
|
|||
| 64937d6fb4 | |||
| 6acc53275d | |||
| 87af143cbd | |||
| e46c1f272b | |||
| 73fbc3d5ad |
28
.gitconfig
28
.gitconfig
@@ -1,28 +0,0 @@
|
|||||||
[core]
|
|
||||||
repositoryformatversion = 0
|
|
||||||
filemode = true
|
|
||||||
bare = false
|
|
||||||
logallrefupdates = true
|
|
||||||
symlinks = true
|
|
||||||
[remote "origin"]
|
|
||||||
url = https://git.mimbach49.de/GerhardHoffmann/customer_999.git
|
|
||||||
fetch = +refs/heads/*:refs/remotes/origin/*
|
|
||||||
[branch "master"]
|
|
||||||
remote = origin
|
|
||||||
merge = refs/heads/master
|
|
||||||
[branch "zg1/zone1"]
|
|
||||||
remote = origin
|
|
||||||
merge = refs/heads/zg1/zone1
|
|
||||||
[branch "zg1/zone2"]
|
|
||||||
remote = origin
|
|
||||||
merge = refs/heads/zg1/zone2
|
|
||||||
[branch "zg1/zone3"]
|
|
||||||
remote = origin
|
|
||||||
merge = refs/heads/zg1/zone3
|
|
||||||
[branch "zg1/zone4"]
|
|
||||||
remote = origin
|
|
||||||
merge = refs/heads/zg1/zone4
|
|
||||||
[pull]
|
|
||||||
rebase = false
|
|
||||||
[push]
|
|
||||||
autoSetupRemote = true
|
|
||||||
@@ -11,8 +11,10 @@ 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
|
||||||
@@ -27,6 +29,7 @@ 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
|
||||||
|
|||||||
BIN
etc/psa_tariff/.tariff04.json.swp
Normal file
BIN
etc/psa_tariff/.tariff04.json.swp
Normal file
Binary file not shown.
@@ -4,15 +4,15 @@
|
|||||||
# opkg-commands added to this file will be executed by ATBUpdateTool.
|
# opkg-commands added to this file will be executed by ATBUpdateTool.
|
||||||
###############################################################################
|
###############################################################################
|
||||||
##
|
##
|
||||||
# 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
|
opkg --cache /var/cache/opkg --download-only upgrade atbqt=4.99.9+git0+fa9d02636f-r0
|
||||||
# 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
|
opkg --cache /var/cache/opkg upgrade atbqt=4.99.9+git0+fa9d02636f-r0
|
||||||
|
|||||||
Reference in New Issue
Block a user