From 31b76e233f4d8641ce2c65aa8432fdbfed5744e8 Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Mon, 15 Jul 2024 13:05:49 +0200 Subject: [PATCH 1/3] startstop: reverse stop - reverse array --- build.profile | 4 ++-- startstop.build.sh | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/build.profile b/build.profile index 106dec5..cae3b71 100644 --- a/build.profile +++ b/build.profile @@ -1,6 +1,6 @@ BUILD_TAG=2.10.2 -BUILD_DIR=. +BUILD_DIR=build BUILD_SRC="${PWD}" . build.local @@ -18,7 +18,7 @@ BUILD_redis=redis-7.2.5 BUILD_python=Python-3.11.9 BUILD_node=node-20.15.0 BUILD_ffmpeg=ffmpeg-7.0 -BUILD_pngquant=pngquant-3.0.3-3-gdbb78b1 +BUILD_pngquant=pngquant-3.0.3-4-ged62a8b BUILD_unpaper=unpaper-7.0.0-125-gfe89949 BUILD_zbar=zbar-0.23.93 BUILD_leptonica=leptonica-1.84.1 diff --git a/startstop.build.sh b/startstop.build.sh index dba3ab1..3a30bca 100755 --- a/startstop.build.sh +++ b/startstop.build.sh @@ -1,6 +1,7 @@ #!/bin/bash set -e set -u +set -x . build.profile @@ -181,8 +182,18 @@ cmd="\${1:-help}" srv="\${2:-all}" if [[ \${srv} = 'all' ]]; then - srv_migrate - for srv in redis nginx gunicorn consumer scheduler worker; do + _srv=(redis nginx gunicorn consumer scheduler worker) + + if [[ \${cmd} = 'start' ]]; then + srv_migrate + fi + + # poor mans reverse + if [[ \${cmd} = 'stop' ]]; then + _srv=\$(eval eval echo "'\"\${_srv['{\$((\${#_srv[@]}-1))..0}']}\"'") + fi + + for "\${_srv[@]}"; do echo "### ./startstop.sh \${cmd} \${srv}" "${PROJECT}"/startstop.sh \${cmd} \${srv} || echo "RET: $?" done From a9bf7fc602ef8d89b6f9c36288456d94a44f8e48 Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Mon, 15 Jul 2024 13:44:09 +0200 Subject: [PATCH 2/3] pngquant: update 3.0.3-4 --> 3.0.3-6 - updated --- build.profile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.profile b/build.profile index e4bd6e3..2c6f4be 100644 --- a/build.profile +++ b/build.profile @@ -18,7 +18,7 @@ BUILD_redis=redis-7.2.5 BUILD_python=Python-3.11.9 BUILD_node=node-20.15.1 BUILD_ffmpeg=ffmpeg-7.0 -BUILD_pngquant=pngquant-3.0.3-4-ged62a8b +BUILD_pngquant=pngquant-3.0.3-6-g9a4952d BUILD_unpaper=unpaper-7.0.0-127-g5bcef8a BUILD_zbar=zbar-0.23.93 BUILD_leptonica=leptonica-1.84.1 From d19fb02f7d46a747bc3a61be920560a8b66f8d48 Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Mon, 15 Jul 2024 14:49:06 +0200 Subject: [PATCH 3/3] startstop.sh: reverse order from start to stop - now redis gets shut down latest --- startstop.build.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/startstop.build.sh b/startstop.build.sh index dba3ab1..fdce8c9 100755 --- a/startstop.build.sh +++ b/startstop.build.sh @@ -181,8 +181,18 @@ cmd="\${1:-help}" srv="\${2:-all}" if [[ \${srv} = 'all' ]]; then - srv_migrate - for srv in redis nginx gunicorn consumer scheduler worker; do + _srv=(redis nginx gunicorn consumer scheduler worker) + + if [[ \${cmd} = 'start' ]]; then + srv_migrate + fi + + # poor mans reverse + if [[ \${cmd} = 'stop' ]]; then + _srv=(\$(eval eval echo "'\"\\\${_srv['{\$((\${#_srv[@]}-1))..0}']}\"'")) + fi + + for srv in \${_srv[@]}; do echo "### ./startstop.sh \${cmd} \${srv}" "${PROJECT}"/startstop.sh \${cmd} \${srv} || echo "RET: $?" done