WMDE
/
osync
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'onovy-ssh_user_opt_fix'

This commit is contained in:
deajan 2015-06-26 17:25:00 +02:00
parent d765bef203 7b7b31fbb0
commit 583998272d
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
osync.sh
View File

@ -4,7 +4,7 @@ PROGRAM="Osync" # Rsync based two way sync engine with fault tolerance
AUTHOR="(L) 2013-2015 by Orsiris \"Ozy\" de Jong" AUTHOR="(L) 2013-2015 by Orsiris \"Ozy\" de Jong"
CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
PROGRAM_VERSION=1.00pre PROGRAM_VERSION=1.00pre
PROGRAM_BUILD=1805201501 PROGRAM_BUILD=2606201501
## type doesn't work on platforms other than linux (bash). If if doesn't work, always assume output is not a zero exitcode ## type doesn't work on platforms other than linux (bash). If if doesn't work, always assume output is not a zero exitcode
if ! type -p "$BASH" > /dev/null if ! type -p "$BASH" > /dev/null
@ -1742,29 +1742,30 @@ function Init
# remove leadng 'ssh://' # remove leadng 'ssh://'
uri=${SLAVE_SYNC_DIR#ssh://*} uri=${SLAVE_SYNC_DIR#ssh://*}
# remove everything after '@' # remove everything after '@'
_first_part=${uri%@*} REMOTE_USER=${uri%@*}
REMOTE_USER=${_first_part%;*}
if [ "$REMOTE_USER" == "" ] if [ "$REMOTE_USER" == "" ]
then then
REMOTE_USER=$(id -un) REMOTE_USER=$LOCAL_USER
fi fi
#fingerprint=${_first_part#*fingerprint=}
if [ "$SSH_RSA_PRIVATE_KEY" == "" ] if [ "$SSH_RSA_PRIVATE_KEY" == "" ]
then then
SSH_RSA_PRIVATE_KEY=~/.ssh/id_rsa SSH_RSA_PRIVATE_KEY=~/.ssh/id_rsa
fi fi
# remove everything before '@' # remove everything before '@'
_last_part=${uri#*@} _hosturiandpath=${uri#*@}
_last_part2=${_last_part%%/*} # remove everything after first '/'
_hosturi=${_hosturiandpath%%/*}
# remove last part if no port defined # remove last part if no port defined
REMOTE_HOST=${_last_part2%%:*} REMOTE_HOST=${_hosturi%%:*}
if [[ "$_last_part2" == *":"* ]] REMOTE_PORT=${_hosturi##*:}
if [ "$REMOTE_PORT" == "" ]
then then
REMOTE_PORT=${_last_part2##*:}
else
REMOTE_PORT=22 REMOTE_PORT=22
fi fi
SLAVE_SYNC_DIR=${_last_part#*/} # remove everything before first '/'
SLAVE_SYNC_DIR=${_hosturiandpath#*/}
fi fi
## Make sure there is only one trailing slash on path ## Make sure there is only one trailing slash on path