Compare commits
3 Commits
master
...
zg1/szeged
Author | SHA1 | Date | |
---|---|---|---|
0ea6af049b | |||
ebcb7c0a60 | |||
ff6955533d |
@ -1,32 +0,0 @@
|
||||
#!/bin/bash -
|
||||
|
||||
# FILE="/tmp/post-merge$(date +%FT%H-%M-%S)"
|
||||
# commit=$(git rev-parse --verify HEAD)
|
||||
# echo "$commit $(git cat-file commit $commit)" >> /tmp/post-merge
|
||||
|
||||
# Redirect output to stderr.
|
||||
exec 1>&2
|
||||
|
||||
if [ -z $IFS ]; then
|
||||
IFS=$'\n'
|
||||
fi
|
||||
|
||||
GIT_PULL_TMP=/tmp/git_pull
|
||||
OPKG_CMDS_TMP=/tmp/opkg_commands
|
||||
|
||||
for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
|
||||
if grep -E -q "(DC.*json|dc2c.hex|tariff.*json)" <<< $fn; then
|
||||
echo "$fn" >> $GIT_PULL_TMP
|
||||
fi
|
||||
if grep -E -q ".*opkg_commands" <<< $fn; then
|
||||
readarray opkg_commands < <(cat $fn)
|
||||
for opkg_c in "${opkg_commands[@]}"; do
|
||||
test -z $opkg_c && continue;
|
||||
test ! -z $(grep -E "^\s*[#]+.*$" <<< $opkg_c) && continue
|
||||
echo -n "$opkg_c" | tr -d '\n\r' >> $OPKG_CMDS_TMP 2>&1
|
||||
echo "" >> $OPKG_CMDS_TMP 2>&1
|
||||
done
|
||||
source "$fn"
|
||||
fi
|
||||
done
|
||||
|
@ -6028,3 +6028,14 @@
|
||||
:10787400661F7A954BF286DE5F910895109639F073
|
||||
:10788400A89586E69EE00197F1F71197C9F7089548
|
||||
:00000001FF
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
{
|
||||
"title":"DC2C_pri30",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":"7777"
|
||||
"":""
|
||||
}
|
@ -1,5 +1,5 @@
|
||||
{
|
||||
"title":"DC2C_pri31",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":"5555"
|
||||
"":""
|
||||
}
|
@ -1,6 +1,5 @@
|
||||
{
|
||||
"title":"DC2C_pri32",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":"",
|
||||
"":"6666"
|
||||
"":""
|
||||
}
|
||||
|
2
etc/psa_config/tariff01.json
Normal file
2
etc/psa_config/tariff01.json
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,4 +0,0 @@
|
||||
{
|
||||
|
||||
|
||||
}
|
File diff suppressed because one or more lines are too long
28
etc/psa_update/opkg_commands
Executable file → Normal file
28
etc/psa_update/opkg_commands
Executable file → Normal file
@ -1,28 +0,0 @@
|
||||
# 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
|
||||
|
||||
opkg update
|
||||
opkg --noaction install atbqt
|
||||
opkg install atbqt
|
||||
|
||||
|
||||
#
|
||||
#
|
||||
#
|
||||
|
@ -1,18 +1,15 @@
|
||||
## Ignore everything
|
||||
*
|
||||
|
||||
## Except
|
||||
!**/.gitignore
|
||||
!**/.git/hooks/*
|
||||
!/etc/*.ini
|
||||
!/etc/atb/*.ini
|
||||
!/etc/psa_config/*
|
||||
!/etc/psa_update/*
|
||||
!/etc/psa_tariff/*
|
||||
!/etc/dc/dc2c.hex
|
||||
|
||||
!/etc/dc/*
|
||||
!/opt/app/ATBAPP/*.ini
|
||||
!/opt/app/sysconfig/*.ini
|
||||
!/opt/app/ISMASMgr/*.ini
|
||||
!/opt/app/sysconfig/*.ini
|
||||
|
||||
!**/.githooks/post-merge
|
||||
|
@ -83,5 +83,5 @@ Currency=HUF
|
||||
[TCP_CONTROL]
|
||||
enable=1
|
||||
|
||||
############
|
||||
|
||||
|
||||
|
@ -1 +0,0 @@
|
||||
"VERSION":"0.1.0","PROJECT":"szeged","ZONE":1,"INFO":"summer sale","LOADED":"2022-06-02T21:57:29"
|
@ -3,4 +3,10 @@
|
||||
"xxx" : "yyyy",
|
||||
"xxx" : "yyyy",
|
||||
"xxx" : "yyyy"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
@ -1 +0,0 @@
|
||||
ffff
|
@ -1,6 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri32",
|
||||
"version":"27.02.2023 12:20 00001",
|
||||
"":"",
|
||||
"":"9999"
|
||||
}
|
Loading…
Reference in New Issue
Block a user