mrjk-foss/idmgr
mrjk-foss/idmgr
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix: git sync merge

Browse Source
This commit is contained in:
mrjk 2018-02-27 02:51:22 -05:00
parent 00dbfe8dcc
commit 30f457a9a0
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/idmgr_mod_git.sh
View File

@ -205,6 +205,7 @@ idm_git__repo_check ()
# Test ssh conenction # Test ssh conenction
lib_log INFO "Testing: $name $user on $host in $path ..." lib_log INFO "Testing: $name $user on $host in $path ..."
set -x
ssh_script="$(idm_git_ssh_scan_script $id $path)" ssh_script="$(idm_git_ssh_scan_script $id $path)"
path=$(ssh -l $user $host "$ssh_script" < /dev/null || true ) path=$(ssh -l $user $host "$ssh_script" < /dev/null || true )
@ -246,6 +247,8 @@ idm_git_ssh_scan_script ()
echo "$path" echo "$path"
elif [ -d \${XDG_CACHE_HOME:-~/.cache}/$path/refs ]; then elif [ -d \${XDG_CACHE_HOME:-~/.cache}/$path/refs ]; then
echo \${XDG_CACHE_HOME:-~/.cache}/$path echo \${XDG_CACHE_HOME:-~/.cache}/$path
elif [ -d \${XDG_CACHE_HOME:-~/.cache}/idmgr/git/$id/local.git/refs ]; then
echo \${XDG_CACHE_HOME:-~/.cache}/idmgr/git/$id/local.git
elif [ -d \${XDG_CACHE_HOME:-~/.local/cache}/idmgr/git/$id/local.git/refs ]; then elif [ -d \${XDG_CACHE_HOME:-~/.local/cache}/idmgr/git/$id/local.git/refs ]; then
echo \${XDG_CACHE_HOME:-~/.local/cache}/idmgr/git/$id/local.git echo \${XDG_CACHE_HOME:-~/.local/cache}/idmgr/git/$id/local.git
fi fi
@ -270,8 +273,11 @@ idm_git__repo_sync ()
#idm_git__repo_check $id #idm_git__repo_check $id
# Sync # Sync
lib_git id fetch --all for r in $( lib_git id remote | grep -v tomb ); do
# If i well undertood, never do a push ! [ ! -z "$r" ] || continue
lib_git id fetch $r master
# If i well undertood, never do a push !
done
} }