Compare commits

...

70 Commits

Author SHA1 Message Date
GerhardHoffmann 43cea1c1fd test 2023-07-10 15:39:10 +02:00
GerhardHoffmann d6ab380c6e test 2023-07-10 15:37:31 +02:00
GerhardHoffmann 73be1372e9 test29 2023-07-10 15:36:56 +02:00
GerhardHoffmann f26434056e test 2023-07-10 15:36:29 +02:00
GerhardHoffmann 67793b7e86 test 2023-07-10 15:35:42 +02:00
GerhardHoffmann 3f4cd2f65c test 2023-07-10 15:22:04 +02:00
GerhardHoffmann b94f65c38b test 2023-07-10 15:12:49 +02:00
GerhardHoffmann 65b091b262 test 2023-07-10 15:12:16 +02:00
GerhardHoffmann c71dfa7bd3 test 2023-07-10 15:11:50 +02:00
GerhardHoffmann 5100508e5e test29 2023-07-10 15:10:57 +02:00
GerhardHoffmann d63fc67fe8 test28 2023-07-10 15:09:48 +02:00
GerhardHoffmann 6be32cd64a test27 2023-07-10 15:05:09 +02:00
GerhardHoffmann 42e3cdc73f test26 2023-07-10 15:04:03 +02:00
GerhardHoffmann d39eba4485 test25 2023-07-10 14:57:01 +02:00
GerhardHoffmann 373f495bfd test24 2023-07-10 14:55:07 +02:00
GerhardHoffmann bc4f80daab test23 2023-07-10 14:53:11 +02:00
GerhardHoffmann 58cd9f2a38 test22 2023-07-10 14:33:19 +02:00
GerhardHoffmann c95421e939 test21 2023-07-10 14:32:17 +02:00
GerhardHoffmann 6c9495a0e0 test20 2023-07-10 14:30:30 +02:00
GerhardHoffmann dd24bd4bff test19 2023-07-10 14:21:24 +02:00
GerhardHoffmann 85e09b423f test18 2023-07-10 14:19:58 +02:00
GerhardHoffmann bf9a5090cf test17 2023-07-10 14:15:47 +02:00
GerhardHoffmann 6c22726061 test16 2023-07-10 14:03:13 +02:00
GerhardHoffmann 409f19818f test15 2023-07-10 14:00:13 +02:00
GerhardHoffmann 34232f3065 test14 2023-07-10 13:57:02 +02:00
GerhardHoffmann 1770def22b test13 2023-07-10 13:50:12 +02:00
GerhardHoffmann 808bffe957 test12 2023-07-10 13:43:46 +02:00
GerhardHoffmann 5ae5f769d1 test11 2023-07-10 13:38:45 +02:00
GerhardHoffmann fbaac58d6e test10 2023-07-10 13:37:03 +02:00
GerhardHoffmann 964e8bd55e test9 2023-07-10 13:36:04 +02:00
GerhardHoffmann f49c4ad3c7 test8 2023-07-10 13:31:30 +02:00
GerhardHoffmann 297a3ce7fd test7 2023-07-10 13:29:06 +02:00
GerhardHoffmann 3bc4ad4d2f test6 2023-07-10 13:25:51 +02:00
GerhardHoffmann 8c27435465 test6 2023-07-10 13:23:20 +02:00
GerhardHoffmann 1b782aaf6f test5 2023-07-10 13:20:06 +02:00
GerhardHoffmann bce7d00345 test4 2023-07-10 13:19:33 +02:00
GerhardHoffmann c4c81a9c4c test3 2023-07-10 13:12:33 +02:00
GerhardHoffmann 59a51aecd4 test2 2023-07-10 13:02:05 +02:00
GerhardHoffmann 03a3775a72 test1 2023-07-10 12:59:47 +02:00
GerhardHoffmann 88936cbf3d test 2023-07-10 12:58:49 +02:00
GerhardHoffmann 0672593883 test 27 2023-07-10 09:20:54 +02:00
GerhardHoffmann 7b2f2a380c test 26 2023-07-10 09:16:53 +02:00
GerhardHoffmann 6638ab854c as for _281 2023-07-07 08:58:10 +02:00
GerhardHoffmann 78eae21e2a test 2023-06-28 13:56:22 +02:00
GerhardHoffmann 6676cf8b46 test 25 2023-06-28 13:45:45 +02:00
GerhardHoffmann 2b2c56bc64 test 23 2023-06-28 13:40:42 +02:00
GerhardHoffmann 81c6f529db test 23 2023-06-28 12:46:45 +02:00
GerhardHoffmann a974b605a9 test 22 2023-06-28 11:24:19 +02:00
GerhardHoffmann 2207678eb0 test 21 2023-06-28 10:58:45 +02:00
GerhardHoffmann bef27cd48d test 20 2023-06-28 10:57:44 +02:00
GerhardHoffmann 121b1973d7 test 19 2023-06-28 10:47:15 +02:00
GerhardHoffmann 5153ad122e test 17 2023-06-28 10:41:33 +02:00
GerhardHoffmann 87a8e8cdaf test 17 2023-06-28 10:29:21 +02:00
GerhardHoffmann b57bf42ca7 test 16 2023-06-28 09:49:49 +02:00
GerhardHoffmann a0495bef04 test 15 2023-06-28 09:45:49 +02:00
GerhardHoffmann 9fcc4f1d52 test 14 2023-06-28 09:44:22 +02:00
GerhardHoffmann 60886325bb test 14 2023-06-28 09:33:13 +02:00
GerhardHoffmann 091daf4536 test 12 2023-06-28 09:28:13 +02:00
GerhardHoffmann a11537b029 test 11 2023-06-28 09:23:11 +02:00
GerhardHoffmann d24d0ffa6a test 10 2023-06-28 09:17:16 +02:00
GerhardHoffmann 19274454bb test 9 2023-06-28 09:12:47 +02:00
GerhardHoffmann 0a5ff88b68 test 8 2023-06-28 09:09:12 +02:00
GerhardHoffmann 14cc168052 test 7 2023-06-27 17:02:35 +02:00
GerhardHoffmann db81c1dd79 test 6 2023-06-27 16:37:02 +02:00
GerhardHoffmann 51d5a59516 test 5 2023-06-27 16:34:44 +02:00
GerhardHoffmann f8d99d59c2 test 4 2023-06-27 16:32:43 +02:00
GerhardHoffmann fb427e156b test 3 2023-06-27 16:28:50 +02:00
GerhardHoffmann ab87d2520a test 2 2023-06-27 15:55:03 +02:00
GerhardHoffmann 12d88cd347 test 2023-06-27 15:46:56 +02:00
GerhardHoffmann ae645dcb12 as for 281 2023-06-27 15:44:49 +02:00
45 changed files with 560 additions and 0 deletions
+62
View File
@@ -0,0 +1,62 @@
#!/bin/bash -
# echo "POST-CHECKOUT"
# echo "PREV-HEAD=$1"
# echo "CURR-HEAD=$2"
# echo "BRANCH-CHECKOUT=$3"
readonly GIT_UPDATE_LOG="/opt/app/tools/atbupdate/update_log.csv"
readonly OPKG_COMMANDS_FILE="./etc/psa_update/opkg_commands"
write_log_file () {
# repo: customer_281
# readonly repo=$(basename $(git rev-parse --show-toplevel))
# branch: customer_281:HEAD->zg1/zone1,origin/zg1/zone1
# readonly branch=$(git log --graph --all --decorate $2 | head -n 1 | sed -E -e 's/(.*?)\((.*)\)/\2/g' | sed -E -e s/[[:space:]]//g)
# readonly line="$repo:$branch"
readonly now="$(date +%Y-%m-%dT%T)"
# echo "DOWNLOAD, /etc/dc/dc2c.bin, $now, N/A" >> $GIT_UPDATE_LOG
# echo "DOWNLOAD, /etc/psa_config/DC2C_print01.json, $now, N/A" >> $GIT_UPDATE_LOG
# 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
# make sure the file is empty
echo -n "" > $GIT_UPDATE_LOG
readarray opkg_commands < <(cat $OPKG_COMMANDS_FILE)
for opkg_c in "${opkg_commands[@]}"; do
# check for lines longer than 'opkg '
if [ "${#opkg_c}" -gt 4 ]; then
# comment: spaces, at least one '#'
grep -qE '^[[:space:]]*#+.*$' <<< "$opkg_c" && continue
echo -n "EXECUTE, $opkg_c, $now, N/A" | tr -d '\n\r' >> $GIT_UPDATE_LOG 2>&1
echo "" >> $GIT_UPDATE_LOG 2>&1
fi
done
fi
fi
}
write_log_file
+56
View File
@@ -0,0 +1,56 @@
#!/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_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
# note: this can be used for any file in the filesystem
echo $(git hash-object $1)
}
get_commit_for_blob () {
# search for the blob in all commits for the file(name) $1
echo $(git log --all --pretty=format:%H -- $2 |
xargs -I{} bash -c "git ls-tree {} -- $2 |
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
if grep -qE "DC2C.*json" <<< $fn; then
# called in repository: $fn is e.g. etc/psa_tariff/tariff01.json
# add '/' prefix
echo "DOWNLOAD, $(echo $fn | awk '{ printf "/"$0 }'), $now, N/A" >> "$GIT_UPDATE_LOG"
elif grep -qE "dc2c.bin" <<< $fn; then
# download the file referenced by the link dc2c.bin
echo "DOWNLOAD, "/etc/dc/dc2c.bin", $now, N/A" >> "$GIT_UPDATE_LOG"
elif grep -qE ".*opkg_commands" <<< $fn; then
readarray opkg_commands < <(cat $fn)
for opkg_c in "${opkg_commands[@]}"; do
# check for lines longer than 'opkg '
if [ "${#opkg_c}" -gt 4 ]; then
# comment: spaces, at least one '#'
grep -qE '^[[:space:]]*#+.*$' <<< "$opkg_c" && continue
echo -n "EXECUTE, $opkg_c, $now, N/A" | tr -d '\n\r' >> $GIT_UPDATE_LOG 2>&1
echo "" >> $GIT_UPDATE_LOG 2>&1
fi
done
fi
done
}
write_log_file
+61
View File
@@ -0,0 +1,61 @@
#!/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
rm -f $GIT_PULL_TMP
rm -f $OPKG_CMDS_TMP
get_blob () { # get the blob of the file(name) passed as $1
# note: this can be used for any file in the filesystem
echo $(git hash-object $1)
}
get_commit_for_blob () {
blob=$(get_blob $1)
if [ ! -z $blob ]; then
# search for the blob in all commits for the file(name) $1
echo $(echo $(git log --all --pretty=format:%H -- $1) |
xargs -I{} bash -c "git ls-tree {} -- $1 |
grep -q $blob && echo {}")
fi
}
changed_file_names () {
for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
CHANGED_FILE_NAMES+=($fn)
done
}
# write_git
for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
if grep -E -q "(DC.*json|dc.*hex|dc.*bin|tariff.*json)" <<< $fn; then
fsize=0
if [[ -f "$fn" ]]; then
fsize=$(ls -l "$fn" | awk '{ print $5 }')
fi
echo "$fn $fsize" >> $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
+27
View File
@@ -0,0 +1,27 @@
# First, ignore everything
*
# 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
!**/.githooks/post-checkout
## 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
View File
View File
View File
View File
+27
View File
@@ -0,0 +1,27 @@
{
}
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
+25
View File
@@ -0,0 +1,25 @@
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
+2
View File
@@ -0,0 +1,2 @@
{
}
+25
View File
@@ -0,0 +1,25 @@
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
+25
View File
@@ -0,0 +1,25 @@
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
+25
View File
@@ -0,0 +1,25 @@
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
+25
View File
@@ -0,0 +1,25 @@
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
+25
View File
@@ -0,0 +1,25 @@
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
+25
View File
@@ -0,0 +1,25 @@
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
+25
View File
@@ -0,0 +1,25 @@
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
+24
View File
@@ -0,0 +1,24 @@
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
+24
View File
@@ -0,0 +1,24 @@
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
+2
View File
@@ -0,0 +1,2 @@
{
}
+23
View File
@@ -0,0 +1,23 @@
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
+23
View File
@@ -0,0 +1,23 @@
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
XXX
View File
View File
View File
View File
View File
View File
View File
View File
View File
View File
View File
View File
View File
View File
View File
View File
View File
View File
View File
View File
View File
+29
View File
@@ -1 +1,30 @@
# 1
# 2
# 3
# 4
# 5
# 6
# 7
# 8
# 9
# 10
# 11
# 12
# 13
# 14
# 15
# 16
# 17
# 18
# 19
# 20
# 21
# 22
# 23
# 24
# 25
# 26
# 27
# 28
# 29
opkg update opkg update