From 25c504601b7a29e95ad5a47961e6589b7ecdafe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kov=C3=A1cs=20Zolt=C3=A1n?= Date: Mon, 26 May 2025 17:04:27 +0200 Subject: [PATCH] Wrong variable name (BASE_DIR instead of SERVICE_BASE) in a check. --- .metadata | Bin 15730 -> 15730 bytes .../tools/backup.d/storage_gitbackup.sh | 4 +++- .../tools/backup.d/storage_gitbackup.sh | 5 ++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.metadata b/.metadata index 16e45a47a28424c49483368e1cbda12aeafea6c9..070b3128e6d7baa6675867c24bc5e053766992fe 100644 GIT binary patch delta 121 zcmexV^{HyZCsyXS?YfgU8i-EjVyoo2wpk~G0SJs|?b4h)QA~95etxmZb`tE9C$MmA zKFRh@pJ#HD30Q^0uO6Mr4+X?0zY*u${MhUT3v*H%#GLnr{F^^nb20J+LzPZH6RR*; PQB!|%0|)zLJ6jU~-)Ji0 delta 119 zcmexV^{HyZCsrmOhshfZ#3pmGRq|AB)X87~0&m$0{>c-?L?`d(7n^J+!9IBc3&-Y@ zZ141W!e*UF2dN0Tc0pwFLjm#0Z^St_KQ?>8!W3W+Hs-w{|K?BDT#P)s=RwRm5N|Fv QSy5AeasvnZWIJ0E0P9aEw*UYD diff --git a/.recipes/mediawiki_mariadb/tools/backup.d/storage_gitbackup.sh b/.recipes/mediawiki_mariadb/tools/backup.d/storage_gitbackup.sh index 636d671..de7ff27 100644 --- a/.recipes/mediawiki_mariadb/tools/backup.d/storage_gitbackup.sh +++ b/.recipes/mediawiki_mariadb/tools/backup.d/storage_gitbackup.sh @@ -11,6 +11,8 @@ # # Author: Kovács Zoltán # License: GNU/GPL v3+ (https://www.gnu.org/licenses/gpl-3.0.en.html) +# 2025-05-21 v0.3.1 +# fix: Wrong variable name (BASE_DIR instead of SERVICE_BASE) in a check. # 2025-05-20 v0.3 # fix: Wrong output redirection order (>/dev/null 2>&1 was reversed). # 2024-08-25 v0.2 @@ -134,7 +136,7 @@ fi # The service must be running - silently gives up here if not. # -[[ -z "$(cd "$BASE_DIR"; "$DOCKER_COMPOSE" $commandstring ps --services --filter "status=running")" ]] \ +[[ -z "$(cd "$SERVICE_BASE"; "$DOCKER_COMPOSE" $commandstring ps --services --filter "status=running")" ]] \ && exit 1 # Attempts the backup commit. diff --git a/.recipes/wordpress_mariadb/tools/backup.d/storage_gitbackup.sh b/.recipes/wordpress_mariadb/tools/backup.d/storage_gitbackup.sh index b21b801..d599041 100644 --- a/.recipes/wordpress_mariadb/tools/backup.d/storage_gitbackup.sh +++ b/.recipes/wordpress_mariadb/tools/backup.d/storage_gitbackup.sh @@ -11,6 +11,8 @@ # # Author: Kovács Zoltán # License: GNU/GPL v3+ (https://www.gnu.org/licenses/gpl-3.0.en.html) +# 2025-05-21 v0.3.1 +# fix: Wrong variable name (BASE_DIR instead of SERVICE_BASE) in a check. # 2025-05-20 v0.3 # fix: The docker itself was missing from the dependency list :(. # fix: Wrong output redirection order (>/dev/null 2>&1 was reversed). @@ -135,7 +137,7 @@ fi # The service must be running - silently gives up here if not. # -[[ -z "$(cd "$BASE_DIR"; "$DOCKER_COMPOSE" $commandstring ps --services --filter "status=running")" ]] \ +[[ -z "$(cd "$SERVICE_BASE"; "$DOCKER_COMPOSE" $commandstring ps --services --filter "status=running")" ]] \ && exit 1 # Attempts the backup commit. @@ -149,6 +151,7 @@ if [ ! -d "$GITDIR/.git" ]; then fi # Stages all the files and non-empty folders. "$GIT" --git-dir="$GITDIR/.git" --work-tree="$SOURCEDIR" add . >/dev/null + # Stores the file system metadata as well, if the tool has been installed. if [ ! -z "$(which metastore)" -a -x "$(which metastore)" ]; then # This commamd silently creates the metastore file if it doesnt' exist yet.