From 605461897edb9a3cdeebae783df00df7f27ec7e6 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 5 Jun 2023 13:59:25 +0200 Subject: [PATCH 01/10] testing new update_psa --- etc/psa_config/DC2C_print10.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_print10.json b/etc/psa_config/DC2C_print10.json index a6e6c16..7c0efca 100644 --- a/etc/psa_config/DC2C_print10.json +++ b/etc/psa_config/DC2C_print10.json @@ -1,5 +1,5 @@ { "title":"DC2C_pri10", "version":"27.02.2023 12:20 00001", -"test":"" +"test":"05062023-1:58" } From 42317e7660db48abcb71c19bc640e05df380fecf Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 5 Jun 2023 15:11:49 +0200 Subject: [PATCH 02/10] testing 15:11 --- etc/psa_config/DC2C_print10.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_print10.json b/etc/psa_config/DC2C_print10.json index 7c0efca..2a14c77 100644 --- a/etc/psa_config/DC2C_print10.json +++ b/etc/psa_config/DC2C_print10.json @@ -1,5 +1,5 @@ { "title":"DC2C_pri10", "version":"27.02.2023 12:20 00001", -"test":"05062023-1:58" +"test":"05062023-15:11" } From b66848bb7533d7c149ddcc39378cdc0a5974dda9 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 5 Jun 2023 15:20:18 +0200 Subject: [PATCH 03/10] use the link dc2c.bin and do not add timestamp into file --- .githooks/post-checkout | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.githooks/post-checkout b/.githooks/post-checkout index 7646424..a381e6c 100755 --- a/.githooks/post-checkout +++ b/.githooks/post-checkout @@ -19,7 +19,7 @@ write_log_file () { if ! grep -Eq "$line" $CHECKOUT_HISTORY_FILE; then # line not found. first checkout of this branch (on this PSA). # mark dc and print-templates to be downloaded by update-tool. - echo "DOWNLOAD, /etc/dc/dc2c.4.21.bin, $now, N/A" >> $GIT_UPDATE_LOG + 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 @@ -41,7 +41,8 @@ write_log_file () { else echo "Found existing line: $line. Do nothing" fi - echo "$line @$now" >> $CHECKOUT_HISTORY_FILE + echo "$line" >> $CHECKOUT_HISTORY_FILE + # echo "$line @$now" >> $CHECKOUT_HISTORY_FILE else echo "*******************************************************" echo " $CHECKOUT_HISTORY_FILE DOES NOT EXIST !!! " From 94bde1039645478efc8724cc9fdad7b45ce80468 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 5 Jun 2023 15:23:07 +0200 Subject: [PATCH 04/10] testing 15:22 --- etc/psa_config/DC2C_print10.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_print10.json b/etc/psa_config/DC2C_print10.json index 2a14c77..fcd380c 100644 --- a/etc/psa_config/DC2C_print10.json +++ b/etc/psa_config/DC2C_print10.json @@ -1,5 +1,5 @@ { "title":"DC2C_pri10", "version":"27.02.2023 12:20 00001", -"test":"05062023-15:11" +"test":"05062023-15:22" } From 0a3bfde4864f82d6da6f0642310562d9ed946223 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 5 Jun 2023 15:26:16 +0200 Subject: [PATCH 05/10] testing 15:26 --- etc/psa_config/DC2C_print10.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_print10.json b/etc/psa_config/DC2C_print10.json index fcd380c..90b47d8 100644 --- a/etc/psa_config/DC2C_print10.json +++ b/etc/psa_config/DC2C_print10.json @@ -1,5 +1,5 @@ { "title":"DC2C_pri10", "version":"27.02.2023 12:20 00001", -"test":"05062023-15:22" +"test":"05062023-15:26" } From 530327e20da3fe079e3ac2aaaa54aa20b7219ed2 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 5 Jun 2023 15:39:28 +0200 Subject: [PATCH 06/10] testing 15:39 --- etc/psa_config/DC2C_print10.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_print10.json b/etc/psa_config/DC2C_print10.json index 90b47d8..df59817 100644 --- a/etc/psa_config/DC2C_print10.json +++ b/etc/psa_config/DC2C_print10.json @@ -1,5 +1,5 @@ { "title":"DC2C_pri10", "version":"27.02.2023 12:20 00001", -"test":"05062023-15:26" +"test":"05062023-15:39" } From 72e9e645a1b802f3de383aecb7b99a1453fc4826 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 5 Jun 2023 15:51:30 +0200 Subject: [PATCH 07/10] check for existence of opkg_commands-file --- .githooks/post-checkout | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.githooks/post-checkout b/.githooks/post-checkout index a381e6c..7414cab 100755 --- a/.githooks/post-checkout +++ b/.githooks/post-checkout @@ -27,16 +27,18 @@ write_log_file () { 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 if grep -qE . "${OPKG_COMMANDS_FILE}"; then - 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 + if [ -f "$OPKG_COMMANDS_FILE" ]; then + 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 else echo "Found existing line: $line. Do nothing" From e6342a1e8fc1efa6f1899849c5e44098da465caa Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 5 Jun 2023 15:58:01 +0200 Subject: [PATCH 08/10] check for existence of opkg_commands-file (2) --- .githooks/post-checkout | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.githooks/post-checkout b/.githooks/post-checkout index 7414cab..76812cf 100755 --- a/.githooks/post-checkout +++ b/.githooks/post-checkout @@ -26,8 +26,8 @@ write_log_file () { echo "DOWNLOAD, /etc/psa_config/DC2C_print04.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 - if grep -qE . "${OPKG_COMMANDS_FILE}"; then - if [ -f "$OPKG_COMMANDS_FILE" ]; then + if [ -f "$OPKG_COMMANDS_FILE" ]; then + if grep -qE . "${OPKG_COMMANDS_FILE}"; then readarray opkg_commands < <(cat $OPKG_COMMANDS_FILE) for opkg_c in "${opkg_commands[@]}"; do # check for lines longer than 'opkg ' From d71556abba03d1277ea163e0f0427e49dd62d987 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 5 Jun 2023 16:00:49 +0200 Subject: [PATCH 09/10] testing 16:00 --- etc/psa_config/DC2C_print10.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_print10.json b/etc/psa_config/DC2C_print10.json index df59817..f594859 100644 --- a/etc/psa_config/DC2C_print10.json +++ b/etc/psa_config/DC2C_print10.json @@ -1,5 +1,5 @@ { "title":"DC2C_pri10", "version":"27.02.2023 12:20 00001", -"test":"05062023-15:39" +"test":"05062023-16:00" } From 1780e75ac9acad1beab8a83a1c7ac9795b882eab Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 5 Jun 2023 16:03:41 +0200 Subject: [PATCH 10/10] testing 16:03 --- etc/psa_config/DC2C_print10.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_print10.json b/etc/psa_config/DC2C_print10.json index f594859..47ab37f 100644 --- a/etc/psa_config/DC2C_print10.json +++ b/etc/psa_config/DC2C_print10.json @@ -1,5 +1,5 @@ { "title":"DC2C_pri10", "version":"27.02.2023 12:20 00001", -"test":"05062023-16:00" +"test":"05062023-16:03" }