From 1141563f92614564100b36b5c1a7ae71343cfebe Mon Sep 17 00:00:00 2001 From: Daniel Lange Date: Wed, 8 Mar 2017 09:53:05 +0100 Subject: Port Github PR #54 from sickill/bitpocket Fix syncing files whose names start with . (dot). --- bitpocket_mac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bitpocket_mac') diff --git a/bitpocket_mac b/bitpocket_mac index 0101766..b3fc6e8 100755 --- a/bitpocket_mac +++ b/bitpocket_mac @@ -139,7 +139,7 @@ function sync { echo "# Saving current state and backing up files (if needed)" echo " | Root dir: $(gpwd)" /usr/local/bin/rsync -av --list-only --exclude "/$DOT_DIR" $RSYNC_OPTS $USER_RULES . | grep "^-\|^d" \ - | gsed "s:^\S*\s*\S*\s*\S*\s*\S*\s*:/:" | gsed "s:^/\.::" | gsort > "$STATE_DIR/tree-current" + | gsed "s:^\S*\s*\S*\s*\S*\s*\S*\s*:/:" | gsed "s:^/\.$::" | gsort > "$STATE_DIR/tree-current" # Prevent bringing back locally deleted files or removing new local files gcp -f "$STATE_DIR/added-prev" "$TMP_DIR/fetch-exclude" @@ -188,7 +188,7 @@ function sync { echo echo "# Saving after-sync state and cleaning up" /usr/local/bin/rsync -av --list-only --exclude "/$DOT_DIR" $USER_RULES . | grep "^-\|^d" \ - | gsed "s:^\S*\s*\S*\s*\S*\s*\S*\s*:/:" | gsed "s:^/\.::" | gsort > "$TMP_DIR/tree-after" + | gsed "s:^\S*\s*\S*\s*\S*\s*\S*\s*:/:" | gsed "s:^/\.$::" | gsort > "$TMP_DIR/tree-after" # Save all newly created files for next run (to prevent deletion of them) @@ -365,7 +365,7 @@ function die { function list { echo -e "\x1b\x5b1;32mbitpocket\x1b\x5b0m will sync the following files:" /usr/local/bin/rsync -av --list-only --exclude "/$DOT_DIR" $USER_RULES . | grep "^-\|^d" \ - | gsed "s:^\S*\s*\S*\s*\S*\s*\S*\s*:/:" | gsed "s:^/\.::" | gsort + | gsed "s:^\S*\s*\S*\s*\S*\s*\S*\s*:/:" | gsed "s:^/\.$::" | gsort } function usage { -- cgit v1.2.3