update

1 files changed, 13 insertions, 5 deletions

diff --git a/home/xyz/.local/bin/upd b/home/xyz/.local/bin/upd
index 06904279..fd8f4cdc 100755
--- a/home/xyz/.local/bin/upd
+++ b/home/xyz/.local/bin/upd
@@ -9,6 +9,19 @@ all () {
 }
 
 backup () {
+	# pull repos and branches from studio, one more backup for 321 backup rule
+	git -C "$HOME/programs/config_local_arch" checkout studio
+	git -C "$HOME/programs/config_local_arch" pull
+	git -C "$HOME/programs/config_local_arch" checkout ka
+	git -C "$HOME/programs/config_local_arch" pull
+	# push ka branch to gitlab, delete this after ditch gitlab
+	git -C "$HOME/programs/config_local_arch" push
+	(
+		umask 077
+		sudo -E git -C /root/programs/config_local_arch_secrets_ka pull
+		sudo -E git -C /root/programs/config_local_arch_secrets pull
+	)
+
 	# --files-from make -a not imply -r, so need to specify explicitly
 	rsync -avPRr --delete --files-from="$XDG_CONFIG_HOME/myconf/upd_rsync_files" / studio:/home/xyz/backup
 
@@ -69,11 +82,6 @@ misc () {
 	git -C "$HOME/programs/reminders" commit --all -m 'update'
 	git -C "$HOME/programs/reminders" push
 	pass git push
-	# pull ka branch from studio
-	git -C "$HOME/programs/config_local_arch" checkout ka
-	git -C "$HOME/programs/config_local_arch" pull
-	# push to gitlab
-	git -C "$HOME/programs/config_local_arch" push
 	rustup update
 }