summaryrefslogtreecommitdiff
path: root/bin/sync-for-dionysus
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2016-04-09 10:40:34 -0700
committerSean Whitton <spwhitton@spwhitton.name>2016-04-09 10:40:48 -0700
commit60ad7593de668260ae7ef67ffcb28a00d469a733 (patch)
treee9af0c9c1a1bd162c8aaeab8e5d52a499c0bd5c0 /bin/sync-for-dionysus
parent6440d2659a7e53495c38f902774586cd089a3767 (diff)
downloaddotfiles-60ad7593de668260ae7ef67ffcb28a00d469a733.tar.gz
move doc sync out of sync-for-dionysus
Should now be able to just use `fmr sync`
Diffstat (limited to 'bin/sync-for-dionysus')
-rwxr-xr-xbin/sync-for-dionysus16
1 files changed, 4 insertions, 12 deletions
diff --git a/bin/sync-for-dionysus b/bin/sync-for-dionysus
index 472d388d..f9289265 100755
--- a/bin/sync-for-dionysus
+++ b/bin/sync-for-dionysus
@@ -10,14 +10,11 @@ athena_cmd () {
# here we rely on the fact that ssh already passes argument
# through `/bin/sh -c' (note use of single-quotes in this
# function)
- # local dir=$1
- # local cmd=$2
ssh athena 'cd $HOME/'"$1"' && . $HOME/.shenv && '"$2"
}
if [ "$(hostname -f)" = "athena.silentflame.com" ]; then
- cd "$HOME/doc" && mr sync
- cd "$HOME/lib/dionysus" && git annex add && git annex sync
+ cd "$LOCAL" && git annex add && git annex sync
else
if [ -d "$FLASH" ]; then
status adding new content on nickflash
@@ -26,23 +23,18 @@ else
status running main sync from ~/lib/dionysus
if [ -d "$FLASH" ]; then
- cd "$HOME/lib/dionysus" && git annex add && git annex sync --content athena nickflash
+ cd "$LOCAL" && git annex add && git annex sync --content athena nickflash
else
- cd "$HOME/lib/dionysus" && git annex add && git annex sync --content athena
+ cd "$LOCAL" && git annex add && git annex sync --content athena
fi
if [ -d "$FLASH" ]; then
status ensuring that new files on nickflash checked out
cd $FLASH && git annex sync
status attempting to unmount nickflash
- kill-ssh-and-umount /media/swhitton/SPWHITTON || true
+ kill-ssh-and-umount /media/swhitton/SPWHITTON # TODO use $FLASH
fi
status ensuring that new files on athena checked out
athena_cmd lib/dionysus "git annex merge"
-
- status syncing ~/doc
- athena_cmd doc "mr sync"
- cd "$HOME/doc" && mr sync
- athena_cmd doc "mr sync"
fi