Commit 54847344 authored by Дмитрий Сафронов's avatar Дмитрий Сафронов
Browse files

Merge branch 'checksum' into 'master' 

checksum

See merge request docker/git-rsync-from-openwrt!5
parents 1de19d0e 9745bec6

sync.sh

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ if [ -n "$OPENWRT_GIT_URL" ]; then 
        git reset -q --hard || die "Couldn't reset repo"

        git pull -q || die "Couldn't pull repo"



        LC_ALL=C.UTF-8 rsync -qax --delete-after --exclude '*-opkg' -e "ssh -p ${OPENWRT_SSH_PORT:-22}" "${OPENWRT_SSH_HOST:-root@192.168.0.1}:/overlay/upper/" overlay/ || die "Couldn't rsync config"

        LC_ALL=C.UTF-8 rsync -acxq --delete-after --exclude '*-opkg' -e "ssh -p ${OPENWRT_SSH_PORT:-22}" "${OPENWRT_SSH_HOST:-root@192.168.0.1}:/overlay/upper/" overlay/ || die "Couldn't rsync config"

        find overlay/ -type d -empty -exec touch {}/.gitkeep \;



        git add -A > /dev/null || die "Couldn't add files"