GerhardHoffmann/customer_281
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'zg1/zone2' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone2

Browse Source
This commit is contained in:
Siegfried Siegert 2023-06-30 14:36:47 +02:00
commit 6a47b52c24
Signed by: SiegfriedSiegert
GPG Key ID: 68371E015E8F0B03
8 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.githooks/post-checkout
View File

@ -24,8 +24,27 @@ write_log_file () {
echo "DOWNLOAD, /etc/psa_config/DC2C_print02.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print03.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print04.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print05.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print06.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print07.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print08.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print09.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print10.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print11.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print12.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print13.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print14.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print15.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print16.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print17.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print18.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print19.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print20.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print29.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print32.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_device.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_cash.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_conf.json, $now, N/A" >> $GIT_UPDATE_LOG
if [ -f "$OPKG_COMMANDS_FILE" ]; then
if grep -qE . "${OPKG_COMMANDS_FILE}"; then
readarray opkg_commands < <(cat $OPKG_COMMANDS_FILE)
@ -40,10 +59,10 @@ write_log_file () {
done
fi
fi
echo "$line" >> $CHECKOUT_HISTORY_FILE
else
echo "Found existing line: $line. Do nothing"
fi
echo "$line" >> $CHECKOUT_HISTORY_FILE
# echo "$line @$now" >> $CHECKOUT_HISTORY_FILE
else
echo "*******************************************************"

1
.githooks/post-merge
View File

@ -14,6 +14,7 @@ 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

BIN
etc/dc/dc2c.4.21.bin
View File

Binary file not shown.

BIN
etc/dc/dc2c.4.22.bin
View File

Binary file not shown.

BIN
etc/dc/dc2c.4.35.bin Executable file
View File

Binary file not shown.

2
etc/dc/dc2c.bin
View File

@ -1 +1 @@
dc2c.4.22.bin
dc2c.4.35.bin

2
etc/psa_tariff/tariff04.json
View File

@ -38,7 +38,7 @@
"pop_max_time": 600,
"pop_min_price": 0,
"pop_carry_over": 1,
"pop_daily_card_price": 0
"pop_daily_card_price": 2400
}
],
"PaymentRate": [

33
etc/psa_update/opkg_commands
View File

@ -1,25 +1,14 @@
###############################################################################
# !!! NOTE !!!
###############################################################################
# opkg-commands added to this file will be executed by ATBUpdateTool.
###############################################################################
# opkg prefix will be added inside evaluating script
#
# package manipulation commands without package:
# update, upgrade, clean
#
# informational commands without package:
# list, list-installed, list-upgradable
#
# ptu5-atb-apinfo
# ptu5-scripts
# ptu5-atb-apinfo
# atb-plugin-calculateprice-prm
# atb-plugin-cc-tcpzvt
# atbqt
# list-installed
# --force-reinstall install ptu5-atb-apinfo
# --force-reinstall install atbqt
# update
# 2023-06-30: return to usual workflow
opkg info ptu5-gitinstaller
opkg info atbqt
opkg update
# opkg --noaction install atbqt
# opkg install atbqt
#
#
#
opkg install ptu5-gitinstaller
opkg install atbqt
opkg info atbqt