From c2a526dcabbebb77462f33846fd4532c87421c37 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Sun, 12 Nov 2017 17:17:51 -0500 Subject: [PATCH] hoisting the custom update stuff into aliases --- scripts/customize/fred/fred_common.alias | 21 +++++- .../fred/scripts/archival/musical_wand.sh | 65 ------------------- .../scripts/archival/update_barkuptree.sh | 28 -------- .../scripts/archival/update_catfurnose.sh | 8 --- .../scripts/archival/update_fredmusicprime.sh | 38 ----------- .../fred/scripts/archival/update_soapbox.sh | 36 ---------- 6 files changed, 19 insertions(+), 177 deletions(-) delete mode 100644 scripts/customize/fred/scripts/archival/musical_wand.sh delete mode 100644 scripts/customize/fred/scripts/archival/update_barkuptree.sh delete mode 100644 scripts/customize/fred/scripts/archival/update_catfurnose.sh delete mode 100644 scripts/customize/fred/scripts/archival/update_fredmusicprime.sh delete mode 100644 scripts/customize/fred/scripts/archival/update_soapbox.sh diff --git a/scripts/customize/fred/fred_common.alias b/scripts/customize/fred/fred_common.alias index 67e332a6..cd4bd5d9 100644 --- a/scripts/customize/fred/fred_common.alias +++ b/scripts/customize/fred/fred_common.alias @@ -1,6 +1,23 @@ -# some aliases that i don't expect very many people to ever want. they are -# based on some of the mount configurations available at home or abroad. +# some aliases that i don't expect very many people to ever want. +# these are very specific to drives and such that i use but which other people wouldn't. + +# pull in any code dependencies. +source "$FEISTY_MEOW_SCRIPTS/core/general_updater.sh" + +# updates the mounted barkuptree drive with stuff on wildmutt. +define_yeti_alias update_barkuptree='update_archive_drive "/media/fred/barkuptreedrive"' + +# updates local archive drive called catfurnose. +define_yeti_alias update_catfurnose='update_archive_drive "/media/fred/catfurnose"' + +# updates the fredmusicprime drive with the latest from /z space. +define_yeti_alias update_fredmusicprime='update_archive_drive "/media/fred/fredmusicprime"' + +# updates my little 1 TB "soapbox" style usb drive with any appropriate archives and source. +define_yeti_alias update_soapbox='update_archive_drive "/media/fred/soapboxdrive"' + + # moo and unmoo mount the local folders i use most. #no longer used. we are doing mostly full directory stores without nfs mounts these days. diff --git a/scripts/customize/fred/scripts/archival/musical_wand.sh b/scripts/customize/fred/scripts/archival/musical_wand.sh deleted file mode 100644 index c3af4be3..00000000 --- a/scripts/customize/fred/scripts/archival/musical_wand.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash - -# musical_wand: distributes music from our primary source to all hosts that are listed -# as being redundant copies for the music. - -# this script is designed to be run on the music host with the super alpha main source of -# music plugged in as an external drive. that being said, it will still work as long as -# the music host has its local copy intact; the local copy of the primary is always what -# is synched onto the other archive hosts. in that sense, the musical host is itself a -# musix archive, but it is treated "special". - -source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh" - -#hmmm: add the goodness around these actions like the "nice" updater so we catch all errors. - -# this host is where all the music is supposed to come from. -MUSICAL_HOST=curie - -#hmmm: this script is currently limited to run ON the music host. it could easily do the backwards thing instead, and copy FROM music host. - -# the list of hosts we know of that are holding onto duplicate copies of the musix archive. -#old list MUSIX_ARCHIVE_SITE_LIST=(surya banshee wildmutt euphrosyne) -MUSIX_ARCHIVE_SITE_LIST=(euphrosyne) -#hmmm: list was contracted a lot, since we don't want to step on the updates done by syncthing. euphrosyne is still our reference copy for what the archive states "should" be. - -if [[ ! ( $(hostname) =~ .*${MUSICAL_HOST}.* ) ]]; then - echo "This script is only designed to run on $MUSICAL_HOST with the" - echo "primary fred music source (external) disc plugged in." - exit 1 -fi - -# synch our local copy on the music host with the primary music drive, source of all goodness. -function get_music_from_alpha_site() -{ - sep - echo "getting musix and basement from fred music prime device" - rsync -av /media/fred/fredmusicprime/musix/* /z/musix/ - rsync -av /media/fred/fredmusicprime/basement/* /z/basement/ - sep - echo -} - -# updates the music on a remote host to our current local copy on the music host. -function update_musix_pile() -{ - sep - local host="$1"; shift - echo "$host: synching musix and basement" - rsync -avz /z/musix/* ${host}:/z/musix/ - rsync -avz /z/basement/* ${host}:/z/basement/ - sep - echo -} - -############## - -# make sure the local machine, our first-stop musix host, is in good shape. -get_music_from_alpha_site - -# run through the steps of updating all our machines. -for i in ${MUSIX_ARCHIVE_SITE_LIST[@]}; do - update_musix_pile $i -done - - diff --git a/scripts/customize/fred/scripts/archival/update_barkuptree.sh b/scripts/customize/fred/scripts/archival/update_barkuptree.sh deleted file mode 100644 index 9b0103f8..00000000 --- a/scripts/customize/fred/scripts/archival/update_barkuptree.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -# updates the mounted barkuptree drive with stuff on wildmutt. -# very specific currently. - -source "$FEISTY_MEOW_SCRIPTS/core/general_updater.sh" - -update_archive_drive /media/fred/barkuptreedrive - -#gone below - -# copy up the archived bluray discs, and possibly future archived formats. -#netcp /z/archons/* $BARKY/bkup_archons/ -#test_or_die "synching archons" - -# copy over our somewhat attenuated but still important walrus archives. -#netcp /z/walrus/* $BARKY/walrus/ -#test_or_die "synching walrus" - -# copy all the music files for future reference. -#netcp /z/musix/* $BARKY/musix/ -#test_or_die "synching musix" - -# back up the photo archives. -#netcp /z/imaginations/* $BARKY/imaginations/ -#test_or_die "synching imaginations" - - diff --git a/scripts/customize/fred/scripts/archival/update_catfurnose.sh b/scripts/customize/fred/scripts/archival/update_catfurnose.sh deleted file mode 100644 index b9622bed..00000000 --- a/scripts/customize/fred/scripts/archival/update_catfurnose.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -# updates local archive drive called catfurnose - -source "$FEISTY_MEOW_SCRIPTS/archival/general_updater.sh" - -update_archive_drive "/media/fred/catfurnose" - diff --git a/scripts/customize/fred/scripts/archival/update_fredmusicprime.sh b/scripts/customize/fred/scripts/archival/update_fredmusicprime.sh deleted file mode 100644 index 80bb07ba..00000000 --- a/scripts/customize/fred/scripts/archival/update_fredmusicprime.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -# updates my little 1 TB "soapbox" style usb drive with items that it should contain. - -source "$FEISTY_MEOW_SCRIPTS/archival/general_updater.sh" - -update_archive_drive "/media/fred/fredmusicprime" - -exit $? - -#####old#####old##### -#gone below. - -sep - -echo Target drive currently has... -ls "$TARGET_FOLDER" -if [ $? -ne 0 ]; then - echo "The target location '$TARGET_FOLDER' is not mounted currently, so cannot be updated." - exit 1 -fi - -# synch all our targets. -for currdir in $MAJOR_ARCHIVE_SOURCES; do - synch_directory_to_target "$currdir" "$TARGET_FOLDER/$(basename $currdir)"/ -done - -sep - -# update source code if present. -echo getting latest fred repositories... -pushd "$TARGET_FOLDER" -update_source_folders $SOURCECODE_HIERARCHY_LIST - -sep - -echo Updated all expected portions of the targets successfully. - diff --git a/scripts/customize/fred/scripts/archival/update_soapbox.sh b/scripts/customize/fred/scripts/archival/update_soapbox.sh deleted file mode 100644 index 57e1ba74..00000000 --- a/scripts/customize/fred/scripts/archival/update_soapbox.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -# updates my little 1 TB "soapbox" style usb drive with items that it should contain. - -source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh" -source "$FEISTY_MEOW_SCRIPTS/archival/shared_updater_parts.sh" - -# where we're backing up to. -TARGET_FOLDER="/media/fred/soapboxdrive" - -sep - -echo Target drive currently has... -ls "$TARGET_FOLDER" -if [ $? -ne 0 ]; then - echo "The target location '$TARGET_FOLDER' is not mounted currently, so cannot be updated." - exit 1 -fi - -# synch all our targets. -for currdir in $MAJOR_ARCHIVE_SOURCES; do - synch_directory_to_target "$currdir" "$TARGET_FOLDER/$(basename $currdir)"/ -done - -sep - -# update source code if present. -echo getting latest fred repositories... -pushd "$TARGET_FOLDER" -for currdir in $SOURCECODE_HIERARCHY_LIST; do - update_source_folders "$curr_dir" -done -sep - -echo Updated all expected portions of the targets successfully. - -- 2.34.1