From 60be9555497a1b38903d18513e5d978b848d0dc9 Mon Sep 17 00:00:00 2001 From: sneak Date: Thu, 20 Jan 2022 22:46:18 -0800 Subject: [PATCH] latest --- .../Makefile.usb-disk-backup | 37 +++++++++++++++++++ .../temp-lstor1-backup.sh | 21 +++++++++++ golang-binaries-installer/install.sh | 12 +++++- homedir.makefile/Makefile | 2 + osxbackup/rsyncbackup.command | 3 +- 5 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 2022-01-19.migrate-nostromo/Makefile.usb-disk-backup create mode 100644 2022-01-19.migrate-nostromo/temp-lstor1-backup.sh diff --git a/2022-01-19.migrate-nostromo/Makefile.usb-disk-backup b/2022-01-19.migrate-nostromo/Makefile.usb-disk-backup new file mode 100644 index 0000000..3391326 --- /dev/null +++ b/2022-01-19.migrate-nostromo/Makefile.usb-disk-backup @@ -0,0 +1,37 @@ +HOMEEXCLUDE := --exclude /.Trash \ + --exclude .DS_Store \ + --exclude /.Spotlight-V100 \ + --exclude /.cache \ + --exclude /.fseventsd \ + --exclude /Library/Caches \ + --exclude /Library/Mail \ + --exclude /Library/Metadata/CoreSpotlight \ + --exclude /tmp + +ROOTEXCLUDE := --exclude /.Trash \ + --exclude /proc \ + --exclude /dev \ + --exclude /.fseventsd \ + --exclude .DS_Store \ + --exclude /System/Volumes/Data/Volumes \ + --exclude /private/var/vm \ + --exclude /System/Volumes/Data/nix \ + --exclude System/Volumes/Data/Users/sneak \ + --exclude /System/Volumes/Data/.fseventsd \ + --exclude /System/Volumes/Data/.Spotlight-V100 \ + --exclude /System/Volumes/Data/private/var/folders \ + --exclude /Volumes + +OPTS := -avP --delete --delete-excluded --delete-before + +HOMEOPTS := $(OPTS) $(HOMEEXCLUDE) +ROOTOPTS := $(OPTS) $(ROOTEXCLUDE) + +default: synchome syncroot + +synchome: + rsync $(HOMEOPTS) $(HOME)/ ./2021-01-12.nostromo.sneakhome/ | tee -a $(shell date +%Y-%m-%d).homesync.log + +syncroot: + rsync $(ROOTOPTS) / ./2021-01-12.nostromo.root/ | tee -a $(shell date +%Y-%m-%d).rootsync.log + diff --git a/2022-01-19.migrate-nostromo/temp-lstor1-backup.sh b/2022-01-19.migrate-nostromo/temp-lstor1-backup.sh new file mode 100644 index 0000000..9ea62e1 --- /dev/null +++ b/2022-01-19.migrate-nostromo/temp-lstor1-backup.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +DST="root@lstor1.local:/srv/lstor1/backup/temp-nostromo-migration" +SRC="" + +sudo rsync -avP \ + --delete --delete-excluded \ + --exclude /proc \ + --exclude /dev \ + --exclude /.fseventsd \ + --exclude /private/var/vm \ + --exclude /System/Volumes/Data/Volumes \ + --exclude /System/Volumes/Data/nix \ + --exclude /System/Volumes/Data/.fseventsd \ + --exclude /System/Volumes/Data/.Spotlight-V100 \ + --exclude /System/Volumes/Data/Users/sneak/.Trash \ + --exclude /System/Volumes/Data/Users/sneak/.cache \ + --exclude /System/Volumes/Data/Users/sneak/Library/Caches \ + --exclude /System/Volumes/Data/private/var/folders \ + --exclude /Volumes \ + "$SRC"/ "$DST"/ diff --git a/golang-binaries-installer/install.sh b/golang-binaries-installer/install.sh index f13d09c..37eeb4c 100644 --- a/golang-binaries-installer/install.sh +++ b/golang-binaries-installer/install.sh @@ -1,9 +1,17 @@ # this is designed to be symlinked to ~/.bashrc.d/999.goinstaller.sh +if ! which mkcert 2>&1 >/dev/null ; then + go install -v filippo.io/mkcert@latest +fi + if ! which certstrap 2>&1 >/dev/null ; then - go install github.com/square/certstrap@latest + go install -v github.com/square/certstrap@latest fi if ! which f2 2>&1 >/dev/null ; then - go install github.com/ayoisaiah/f2/cmd/f2@latest + go install -v github.com/ayoisaiah/f2/cmd/f2@latest +fi + +if ! which pack 2>&1 >/dev/null ; then + go install -v github.com/buildpacks/pack/cmd/pack@latest fi diff --git a/homedir.makefile/Makefile b/homedir.makefile/Makefile index 09fe1bd..399abd6 100644 --- a/homedir.makefile/Makefile +++ b/homedir.makefile/Makefile @@ -49,6 +49,8 @@ clean: cleanup @echo $(PREFIX) $@ $(SUFFIX) @-rm -rf ~/.tmp/* @-rm -rf ~/.Trash/* + @-rm -rf ~/Library/Google + @-rm -rf ~/Library/ApplicationSupport/Google/RLZ @-rm -rf $(JUNKFILES) size: diff --git a/osxbackup/rsyncbackup.command b/osxbackup/rsyncbackup.command index eb7a12f..ba24725 100755 --- a/osxbackup/rsyncbackup.command +++ b/osxbackup/rsyncbackup.command @@ -58,6 +58,8 @@ RE+=" --exclude=/Library/Application?Support/MobileSync/" RE+=" --exclude=/Library/Application?Support/SecondLife/cache/" RE+=" --exclude=/Library/Application?Support/Steam/SteamApps/" RE+=" --exclude=/Library/Application?Support/SyncServices/" +RE+=" --exclude=/Library/Application?Support/protonmail/bridge/cache" +RE+=" --exclude=/Library/Metadata" RE+=" --exclude=/Library/Caches/" RE+=" --exclude=/Library/Containers/com.docker.docker/" RE+=" --exclude=/Library/Cookies/" @@ -80,7 +82,6 @@ RE+=" --exclude=/Library/iTunes/iPhone?Software?Updates/" RE+=" --exclude=/Music/iTunes/Album?Artwork/" RE+=" --exclude=/Pictures/iPod?Photo?Cache/" RE+=" --exclude=/Receivd/" -RE+=" --exclude=/VirtualBox?VMs/" MINRE="" MINRE+=" --exclude=/.fseventsd/"