Merge branch 'master' of github.com:deajan/osync
Merged v1.00pre into master
This commit is contained in:
commit
f870e9b1e6
4
osync.sh
4
osync.sh
|
@ -1660,6 +1660,10 @@ function Init
|
||||||
# remove everything after '@'
|
# remove everything after '@'
|
||||||
_first_part=${uri%@*}
|
_first_part=${uri%@*}
|
||||||
REMOTE_USER=${_first_part%;*}
|
REMOTE_USER=${_first_part%;*}
|
||||||
|
if [ -n "$REMOTE_USER" ]
|
||||||
|
then
|
||||||
|
REMOTE_USER=$(id -un)
|
||||||
|
fi
|
||||||
#fingerprint=${_first_part#*fingerprint=}
|
#fingerprint=${_first_part#*fingerprint=}
|
||||||
if [ "$SSH_RSA_PRIVATE_KEY" == "" ]
|
if [ "$SSH_RSA_PRIVATE_KEY" == "" ]
|
||||||
then
|
then
|
||||||
|
|
Loading…
Reference in New Issue