lib/dionysus content now merged into other annexes

4 files changed, 2 insertions, 31 deletions

diff --git a/.mrconfig.in b/.mrconfig.in
index c7f5e899..0af23e33 100644
--- a/.mrconfig.in
+++ b/.mrconfig.in
@@ -635,34 +635,6 @@ fixups =
         git annex adjust --hide-missing --unlock
     fi
 
-# --- git annex for university stuff
-
-[lib/dionysus]
-checkout = git clone demeterp:dionysus
-post_checkout =
-    cd dionysus
-    git annex init
-    on athena || git remote add athena athenah:lib/dionysus
-status = git annex status
-update = git annex sync --no-content
-push = git annex sync --content
-#sync = sync-for-dionysus
-sync = git annex sync --content
-
-# origin remote is just for keeping a backup copy of metadata.  athena
-# remote, in $HOME on athena, contains a copy of content.  At present,
-# origin remote only updated by sysmaint script (run weekly)
-fixups =
-    git config push.default matching
-    git config annex.startupscan false
-    git config annex.autocommit true # needed for ga sync
-    git config annex.addunlocked true # for simplicity with existing workflows
-    git config remote.origin.annex-ignore true
-    git config mrrepo.review-unused false
-    git config unpushed-tags.ignore true
-
-skip = lazy
-
 # --- git annex for podcasts
 
 [lib/podcasts]
diff --git a/bin/sync-for-dionysus b/archive/bin/sync-for-dionysus
index 3dc366a1..3dc366a1 100755
--- a/bin/sync-for-dionysus
+++ b/archive/bin/sync-for-dionysus
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/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