lib/dionysus content now merged into other annexes

3 files changed, 2 insertions, 57 deletions

diff --git a/bin/locmaint b/bin/locmaint
index f551e9a1..30808620 100755
--- a/bin/locmaint
+++ b/bin/locmaint
@@ -99,8 +99,7 @@ our @remote_annexes = (
     { origin => "athenag:annex.git",   homedir => "lib/annex", lazy => 1 },
     { origin => "athenag:annex19.git", homedir => "annex" },
     { origin => "athenag:libpriv.git", homedir => "lib/priv" },
-    { origin => "athena:wikiannex",    homedir => "lib/wikiannex" },
-    { origin => "athenap:dionysus",    homedir => "lib/dionysus" });
+    { origin => "athena:wikiannex",    homedir => "lib/wikiannex" });
 
 for (getpwuid($<) . '@' . `hostname -f`) {
     chomp;
diff --git a/bin/sync-for-dionysus b/bin/sync-for-dionysus
deleted file mode 100755
index 3dc366a1..00000000
--- a/bin/sync-for-dionysus
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-. "$HOME/.shenv"
-. "$HOME/src/dotfiles/lib-src/tputfs.sh"
-
-# Sync ~/lib/dionysus annex, taking account of how I access it from
-# dionysus.  Obsoleted by receive.denyCurrentBranch=updateInstead,
-# once git annex >= 6.20170228 reaches athena
-
-set -e
-
-LOCAL="$HOME/lib/dionysus"
-FLASH="/media/swhitton/SPWHITTON/doc"
-
-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)
-    ssh athena 'cd $HOME/'"$1"' && . $HOME/.shenv && '"$2"
-}
-
-if [ "$(hostname -f)" = "athena.silentflame.com" ]; then
-    cd "$LOCAL" && git annex add && git annex sync
-else
-    # if [ -d "$FLASH" ]; then
-    #     status adding new content on nickflash
-    #     cd $FLASH && git annex add && git annex sync --no-pull --no-push --message=add
-    # fi
-
-    status work around gnupg bug on athena
-    ssh athena 'rm $XDG_RUNTIME_DIR/gnupg/*' ||:
-
-    status adding and syncing on athena
-    athena_cmd lib/dionysus "git annex add"
-    athena_cmd lib/dionysus "git annex sync origin"
-    
-    status running main sync from ~/lib/dionysus
-    # if [ -d "$FLASH" ]; then
-    #     cd "$LOCAL" && git annex add && git annex sync --content athena nickflash
-    # else
-        cd "$LOCAL" && git annex add && git annex sync --content
-    # 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 # TODO use $FLASH
-    # fi
-    
-    status ensuring that new files on athena checked out
-    # athena_cmd lib/dionysus "git annex merge"
-    athena_cmd lib/dionysus "git annex sync origin"
-fi
diff --git a/bin/usbskelhere b/bin/usbskelhere
index 06f89cab..d242e482 100755
--- a/bin/usbskelhere
+++ b/bin/usbskelhere
@@ -12,7 +12,7 @@ skelhere ()
     cp -L ~/lib/pro.terminal lib
     cp -L "$HOME/lib/annex/doc/sounds/Rainy Mood pomodoro.mp3" lib
     zip -j lib/spwhitton.zip  lib/*.reg bin/*
-    status now you might want to clone ~/lib/dionysus\; see comproc.org
+    # status now you might want to clone ~/lib/dionysus\; see comproc.org
 }
 
 while true; do