From 28e56b0cea5c3d671007424169b7ea75a78455ac Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Mon, 16 Oct 2017 19:02:55 -0400 Subject: [PATCH] cleaning some more in archive mgt scripts about to spring some code from the compare file into archiver parts. --- scripts/customize/fred/fred_common.alias | 8 +++-- .../customize/fred/scripts/compare_soapbox.sh | 18 ++++++++--- .../customize/fred/scripts/update_soapbox.sh | 32 ++----------------- 3 files changed, 20 insertions(+), 38 deletions(-) diff --git a/scripts/customize/fred/fred_common.alias b/scripts/customize/fred/fred_common.alias index 77f4e48d..67e332a6 100644 --- a/scripts/customize/fred/fred_common.alias +++ b/scripts/customize/fred/fred_common.alias @@ -3,9 +3,11 @@ # based on some of the mount configurations available at home or abroad. # moo and unmoo mount the local folders i use most. -define_yeti_alias moo='check_mount /z/stuffing ; check_mount /z/walrus ; check_mount /z/chunky ; check_mount /z/fredgrid' -define_yeti_alias unmoo='sudo umount /z/stuffing ; sudo umount /z/walrus ; sudo umount /z/chunky ; sudo umount /z/fredgrid' +#no longer used. we are doing mostly full directory stores without nfs mounts these days. +#define_yeti_alias moo='check_mount /z/stuffing ; check_mount /z/walrus ; check_mount /z/chunky ; check_mount /z/fredgrid' +#define_yeti_alias unmoo='sudo umount /z/stuffing ; sudo umount /z/walrus ; sudo umount /z/chunky ; sudo umount /z/fredgrid' # load in the gffs build scripts. -source "$FEISTY_MEOW_SCRIPTS/buildor/gffs_builders.sh" +# not currently used. this probably was adding a bit of startup time. +#source "$FEISTY_MEOW_SCRIPTS/buildor/gffs_builders.sh" diff --git a/scripts/customize/fred/scripts/compare_soapbox.sh b/scripts/customize/fred/scripts/compare_soapbox.sh index 43f55557..8dd3f44a 100644 --- a/scripts/customize/fred/scripts/compare_soapbox.sh +++ b/scripts/customize/fred/scripts/compare_soapbox.sh @@ -6,10 +6,18 @@ source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh" -for currdir in basement imaginations musix walrus; do - sep - echo "comparing $currdir where 'less than' is on the soapbox..." - compare_dirs /media/fred/soapboxdrive/$currdir /z/$currdir -done +function compare_archives_with_target() +{ + local target="$1"; shift + + for currdir in $ARCHIVE_COLLECTION_LIST; do + sep + echo "comparing '$currdir' with target '$target', where 'less thans' are on the target..." + compare_dirs "$target/$(basename $currdir)" "$currdir" + done +} + +compare_archives_with_target /media/fred/soapboxdrive sep + diff --git a/scripts/customize/fred/scripts/update_soapbox.sh b/scripts/customize/fred/scripts/update_soapbox.sh index 3ca715eb..f2208f53 100644 --- a/scripts/customize/fred/scripts/update_soapbox.sh +++ b/scripts/customize/fred/scripts/update_soapbox.sh @@ -17,42 +17,14 @@ if [ $? -ne 0 ]; then exit 1 fi -#function synch_directory_to_target() -#{ -# local from="$1"; shift -# local to="$1"; shift -# -# sep -# -# if [ ! -d "$from" ]; then -# echo "skipping synch one missing source directory $from; this is not normal!" -# fi -# if [ ! -d "$to" ]; then -# echo "skipping synch into non-existent directory $to" -# fi -# -# echo "synching from $from into $to" -# netcp "$from"/* "$to"/ -# if [ $? -ne 0 ]; then -# echo "The synchronization of $from into $to has failed." -# exit 1 -# fi -#} - -# do all our targets. +# synch all our targets. for currdir in $ARCHIVE_COLLECTIONS_LIST; do synch_directory_to_target "$currdir" "$TARGET_FOLDER/$(basename $currdir)"/ -# sep -# echo "synching $currdir..." -# netcp $currdir/* /media/fred/soapboxdrive/$currdir/ -# if [ $? -ne 0 ]; then -# echo "The $currdir sync failed." -# exit 1 -# fi done sep +# update source code if present. echo getting latest fred repositories... pushd "$TARGET_FOLDER" update_source_folders extra_brain -- 2.34.1