diff --git a/rcopy.sh b/rcopy.sh index 76fad2c..7da9cd4 100755 --- a/rcopy.sh +++ b/rcopy.sh @@ -254,34 +254,39 @@ fi ## - $AGENT muss (root) gehören und darf nicht beschreibbar sein ## - -if [ ! -O $AGENT ] || ! ps ax | grep ssh-agent | grep -v grep > /dev/null ; then + +#if [ ! -O $AGENT ] || ! ps ax | grep ssh-agent | grep -v grep > /dev/null ; then +# killall ssh-agent > /dev/null 2> /dev/null +# rm -f $AGENT +# ssh-agent > $AGENT; . $AGENT > /dev/null ; ssh-add ${SSH_KEY} > /dev/null 2>&1 +#fi +# +#if [ ! -O $AGENT ]; then +# +# msg_00="\n[ Error ]: No file \"$AGENT\" for ssh-agent informations found or i'm not the owner !!" +# msg_01="\t =======================" +# msg_02="\t !! BACKUP INTERUPTED !!" +# msg_03="As user \"$USER\" do:\n\tssh-agent > $AGENT; . $AGENT; ssh-add" +# msg="${msg_00}\n\n${msg_01}\n${msg_02}\n${msg_01}\n\n${msg_03}" +# if $MANUAL ; then +# echo -e "\n$msg\n" +# else +# datum="$(date +"%d.%m.%Y")" +# subject="Backup Errors $company -- $datum" +# subject_utf8="$(echo "$subject" | iconv -t UTF8)" +# subject_utf8_encoded="=?utf-8?B?$(echo $subject_utf8 | base64 --wrap=0)?=" +# echo -e "To:${admin_email}\n${content_type}\nSubject:${subject_utf8_encoded}\n${msg}\n" | /usr/sbin/sendmail -F "Errors BACKUP $company" -f $from_address $admin_email +# fi +# +# exit 1 +#fi +#. $AGENT > /dev/null 2>&1 + +if [ `$ps aux | $grep -e"^$USER" | $grep "$SSH_AGENT_PID" | $grep ssh-agent | awk '{print$2}'` ]; then killall ssh-agent > /dev/null 2> /dev/null - rm -f $AGENT - eval "$(ssh-agent -s)" > /dev/null 2>&1 ; ssh-add ${SSH_KEY} > /dev/null 2>&1; - #ssh-agent > $AGENT; . $AGENT > /dev/null ; ssh-add > /dev/null 2>&1 fi - -if [ ! -O $AGENT ]; then - - msg_00="\n[ Error ]: No file \"$AGENT\" for ssh-agent informations found or i'm not the owner !!" - msg_01="\t =======================" - msg_02="\t !! BACKUP INTERUPTED !!" - msg_03="As user \"$USER\" do:\n\tssh-agent > $AGENT; . $AGENT; ssh-add" - msg="${msg_00}\n\n${msg_01}\n${msg_02}\n${msg_01}\n\n${msg_03}" - if $MANUAL ; then - echo -e "\n$msg\n" - else - datum="$(date +"%d.%m.%Y")" - subject="Backup Errors $company -- $datum" - subject_utf8="$(echo "$subject" | iconv -t UTF8)" - subject_utf8_encoded="=?utf-8?B?$(echo $subject_utf8 | base64 --wrap=0)?=" - echo -e "To:${admin_email}\n${content_type}\nSubject:${subject_utf8_encoded}\n${msg}\n" | /usr/sbin/sendmail -F "Errors BACKUP $company" -f $from_address $admin_email - fi - - exit 1 -fi -. $AGENT > /dev/null 2>&1 +eval "$(ssh-agent -s)" > /dev/null 2>&1 ; ssh-add ${SSH_KEY} > /dev/null 2>&1 if [ ! `$ps aux | $grep -e"^$USER" | $grep "$SSH_AGENT_PID" | $grep ssh-agent | awk '{print$2}'` ]; then