zio
/
rootfs
2
0
Fork 0
Code

various

main
Ducky 2024-04-01 23:20:42 +01:00
parent b358e5b924
commit 1b9994d09d
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr/local/bin/sh.zio.backup
View File

@ -128,7 +128,11 @@ function invoke_script() {
exec 3>&1 exec 3>&1
script_error_log="$(create_tmp_file)" script_error_log="$(create_tmp_file)"
script_output=$("$backup_scripts_dir/$backup_script_filename" 2>$script_error_log 2>&1 | tee /dev/fd/3) script_output=$("$backup_scripts_dir/$backup_script_filename" 2>$script_error_log | tee /dev/fd/3)
if [[ -f "$script_error_log" ]]; then
cat "$script_error_log"
fi
if [[ "$?" == 0 ]]; then if [[ "$?" == 0 ]]; then
trigger_notify "success" "Backup script succeeded: $backup_script_name" "..." trigger_notify "success" "Backup script succeeded: $backup_script_name" "..."

12
usr/local/libexec/zio/helpers/bash.sh
View File

@ -8,7 +8,7 @@ function create_log() {
content="$1" content="$1"
log_dir="/var/log/zio" log_dir="/var/log/zio"
log_file="$(date +%Y%m%d%H%M%S).$(echo $RANDOM | md5sum | head -c 6; echo;).log" log_file="$(get_random_filename).log"
if [[ ! $(id -u) = 0 ]]; then if [[ ! $(id -u) = 0 ]]; then
log_dir="/tmp/zio/logs" log_dir="/tmp/zio/logs"
@ -24,7 +24,11 @@ function create_log() {
function create_tmp_file() { function create_tmp_file() {
name="$1" name="$1"
prefix_dir="/tmp/zio" prefix_dir="/tmp/zio"
tmp_path="$prefix_dir/$(date +%s).$name" tmp_path="$prefix_dir/$(get_random_filename)"
if [[ "$name" != "" ]]; then
tmp_path+=".$name"
fi
mkdir -p "$prefix_dir" mkdir -p "$prefix_dir"
touch "$tmp_path" touch "$tmp_path"
@ -59,6 +63,10 @@ function get_config_dir() {
echo "$config_dir" echo "$config_dir"
} }
function get_random_filename() {
echo "$(date +%Y%m%d%H%M%S).$(echo $RANDOM | md5sum | head -c 6; echo;)"
}
function get_real_path() { function get_real_path() {
echo "$(cd -P "$1" && pwd)" echo "$(cd -P "$1" && pwd)"
} }