Yavook.de/kiwi-backup
1
0
Fork 0
mirror of https://github.com/yavook/kiwi-backup.git synced 2024-11-22 06:53:00 +00:00
Code Packages Activity

Merge branch 'release/0.4'

Browse source
This commit is contained in:
Jörn-Michael Miehe 2020-09-22 17:00:28 +02:00
commit c9f931d3f0
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
do-plicity
View file

@ -5,6 +5,7 @@
############# #############
# commands # commands
env_exe="$(command -v env)"
ionice_exe="$(command -v ionice)" ionice_exe="$(command -v ionice)"
duplicity_exe="$(command -v duplicity)" duplicity_exe="$(command -v duplicity)"
@ -21,11 +22,12 @@ if [ -f "${duplicity_secrets_file}" ]; then
. "${duplicity_secrets_file}" . "${duplicity_secrets_file}"
fi fi
env_changes=""
# check if uses encryption # check if uses encryption
if [ -n "${GPG_KEY_ID}" ]; then if [ -n "${GPG_KEY_ID}" ]; then
# gpg key given # gpg key given
PASSPHRASE="${GPG_PASSPHRASE}" env_changes="${env_changes} PASSPHRASE='${GPG_PASSPHRASE}'"
export PASSPHRASE
encrypt_opts="--encrypt-key='${GPG_KEY_ID}'" encrypt_opts="--encrypt-key='${GPG_KEY_ID}'"
else else
# no key given # no key given
@ -35,8 +37,8 @@ fi
# check if uses AWS # check if uses AWS
if [ -n "${AWS_ACCESS_KEY_ID}" ]; then if [ -n "${AWS_ACCESS_KEY_ID}" ]; then
# export AWS credentials # export AWS credentials
export AWS_ACCESS_KEY_ID env_changes="${env_changes} AWS_ACCESS_KEY_ID='${AWS_ACCESS_KEY_ID}'"
export AWS_SECRET_ACCESS_KEY env_changes="${env_changes} AWS_SECRET_ACCESS_KEY='${AWS_SECRET_ACCESS_KEY}'"
fi fi
############# #############
@ -65,7 +67,14 @@ print_command() {
pc_task="${1}" pc_task="${1}"
shift 1 shift 1
pc_cmdline="${ionice_exe} -c 3 ${duplicity_exe} ${encrypt_opts}" # if environment should be changed, call with "env"
if [ -n "${env_changes}" ]; then
pc_cmdline="${env_exe}${env_changes} "
else
pc_cmdline=""
fi
pc_cmdline="${pc_cmdline}${ionice_exe} -c 3 ${duplicity_exe} ${encrypt_opts}"
case "${pc_task}" in case "${pc_task}" in
backup) backup)