diff --git a/.githooks/post-checkout b/.githooks/post-checkout index 76812cf..8b86380 100755 --- a/.githooks/post-checkout +++ b/.githooks/post-checkout @@ -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 "*******************************************************" diff --git a/.githooks/post-merge b/.githooks/post-merge index 5dbada0..fd0f5fe 100755 --- a/.githooks/post-merge +++ b/.githooks/post-merge @@ -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 diff --git a/etc/dc/dc2c.4.21.bin b/etc/dc/dc2c.4.21.bin deleted file mode 100755 index 0d6ce45..0000000 Binary files a/etc/dc/dc2c.4.21.bin and /dev/null differ diff --git a/etc/dc/dc2c.4.22.bin b/etc/dc/dc2c.4.22.bin deleted file mode 100755 index 5172732..0000000 Binary files a/etc/dc/dc2c.4.22.bin and /dev/null differ diff --git a/etc/dc/dc2c.4.35.bin b/etc/dc/dc2c.4.35.bin new file mode 100755 index 0000000..197a56e Binary files /dev/null and b/etc/dc/dc2c.4.35.bin differ diff --git a/etc/dc/dc2c.bin b/etc/dc/dc2c.bin index 28e7d83..6012a81 120000 --- a/etc/dc/dc2c.bin +++ b/etc/dc/dc2c.bin @@ -1 +1 @@ -dc2c.4.22.bin \ No newline at end of file +dc2c.4.35.bin \ No newline at end of file diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json index 127a8f5..9e77830 100644 --- a/etc/psa_tariff/tariff04.json +++ b/etc/psa_tariff/tariff04.json @@ -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": [ diff --git a/etc/psa_update/opkg_commands b/etc/psa_update/opkg_commands index 354c64f..aa2b947 100755 --- a/etc/psa_update/opkg_commands +++ b/etc/psa_update/opkg_commands @@ -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