various changes
This commit is contained in:
parent
8d0daeae24
commit
a8c3bb3fe0
1 changed files with 8 additions and 8 deletions
|
@ -129,10 +129,10 @@ else
|
||||||
[[ -f "$env_dir/script-post" ]] && post_script="$env_dir/script-post"
|
[[ -f "$env_dir/script-post" ]] && post_script="$env_dir/script-post"
|
||||||
|
|
||||||
if [[ -f "$env_dir/config" ]]; then
|
if [[ -f "$env_dir/config" ]]; then
|
||||||
|
[[ ! -z $(get_prop "$env_dir/config" B2_ACCOUNT_ID) ]] && \
|
||||||
|
b2_account_id="$(get_prop "$env_dir/config" B2_ACCOUNT_ID)"
|
||||||
[[ ! -z $(get_prop "$env_dir/config" B2_ACCOUNT_KEY) ]] && \
|
[[ ! -z $(get_prop "$env_dir/config" B2_ACCOUNT_KEY) ]] && \
|
||||||
b2_account_key="$(get_prop "$env_dir/config" B2_ACCOUNT_KEY)"
|
b2_account_key="$(get_prop "$env_dir/config" B2_ACCOUNT_KEY)"
|
||||||
[[ ! -z $(get_prop "$env_dir/config" EXCLUDES) ]] && \
|
|
||||||
b2_account_id="$(get_prop "$env_dir/config" B2_ACCOUNT_ID)"
|
|
||||||
[[ ! -z $(get_prop "$env_dir/config" EXCLUDES) ]] && \
|
[[ ! -z $(get_prop "$env_dir/config" EXCLUDES) ]] && \
|
||||||
IFS=';' read -ra excludes <<< "$(get_prop "$env_dir/config" EXCLUDES)"
|
IFS=';' read -ra excludes <<< "$(get_prop "$env_dir/config" EXCLUDES)"
|
||||||
[[ ! -z $(get_prop "$env_dir/config" PATHS) ]] && \
|
[[ ! -z $(get_prop "$env_dir/config" PATHS) ]] && \
|
||||||
|
@ -148,18 +148,18 @@ fi
|
||||||
|
|
||||||
[[ -z $paths ]] && say_die "No paths specified. Aborting..."
|
[[ -z $paths ]] && say_die "No paths specified. Aborting..."
|
||||||
|
|
||||||
if [[ -z $b2_account_key ]]; then
|
|
||||||
say_die "B2_ACCOUNT_KEY (in $env_dir/config) not set. Aborting..."
|
|
||||||
else
|
|
||||||
export B2_ACCOUNT_KEY="$b2_account_key"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -z $b2_account_id ]]; then
|
if [[ -z $b2_account_id ]]; then
|
||||||
say_die "B2_ACCOUNT_ID (in $env_dir/config) not set. Aborting..."
|
say_die "B2_ACCOUNT_ID (in $env_dir/config) not set. Aborting..."
|
||||||
else
|
else
|
||||||
export B2_ACCOUNT_ID="$b2_account_ID"
|
export B2_ACCOUNT_ID="$b2_account_ID"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ -z $b2_account_key ]]; then
|
||||||
|
say_die "B2_ACCOUNT_KEY (in $env_dir/config) not set. Aborting..."
|
||||||
|
else
|
||||||
|
export B2_ACCOUNT_KEY="$b2_account_key"
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ ! -f $pre_script_file ]]; then
|
if [[ ! -f $pre_script_file ]]; then
|
||||||
say_do "Executing pre-backup script..."
|
say_do "Executing pre-backup script..."
|
||||||
. $pre_script_file
|
. $pre_script_file
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue