From 5dc53f19636cf271ecc872b0c7e0e0cf0e2f6d67 Mon Sep 17 00:00:00 2001 From: Ducky Date: Tue, 22 Aug 2023 00:38:45 +0100 Subject: [PATCH] various --- usr/local/bin/sh.zio.backup | 2 +- usr/local/libexec/zio/helpers/bash.sh | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/usr/local/bin/sh.zio.backup b/usr/local/bin/sh.zio.backup index d3302df..4e9563f 100755 --- a/usr/local/bin/sh.zio.backup +++ b/usr/local/bin/sh.zio.backup @@ -12,7 +12,7 @@ fi me_filename="$(basename "$(realpath -s "$0")")" backup_scripts_dir="$(get_config_dir "sh.zio.backup")/scripts" -cache_dir="/var/cache/sh.zio.backup/restic" +cache_dir="$(get_config_dir "sh.zio.backup" "/var/cache")/restic" secrets_dir="$(get_config_dir "sh.zio.backup")/secrets" host="$(hostname -s)" now="$(date +"%Y-%m-%d %H:%M:%S")" diff --git a/usr/local/libexec/zio/helpers/bash.sh b/usr/local/libexec/zio/helpers/bash.sh index c085fae..c271b10 100644 --- a/usr/local/libexec/zio/helpers/bash.sh +++ b/usr/local/libexec/zio/helpers/bash.sh @@ -10,14 +10,19 @@ function die() { } function get_config_dir() { - prog="$1" + prog="$(echo $1 | sed -e "s/sh.zio.//g")" + prefix="/etc/zio" + + if [[ -n "$2" ]]; then + prefix="$2" + fi config_dir="" if [[ ! -z $prog ]]; then - config_dir="/etc/zio/$prog" + config_dir="$prefix/$prog" else - config_dir="/etc/zio" + config_dir="$prefix" fi if [[ ! -d "$config_dir" ]]; then