From 50234cef9c77c5579746c37a5bc3d82647fe75bb Mon Sep 17 00:00:00 2001
From: Johannes Randerath <joranderathsg@gmail.com>
Date: Thu, 9 May 2024 21:06:39 +0200
Subject: [PATCH] backup-20240509-21h06

---
 backup_git.sh      |  2 +-
 push_backup_git.sh |  2 +-
 root_backup_git.sh | 12 +++++-------
 user_backup_git.sh | 10 +++++-----
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/backup_git.sh b/backup_git.sh
index 0c38449..0ca2326 100644
--- a/backup_git.sh
+++ b/backup_git.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 DATE=$(date +%Y%m%d-%Hh%M)
-LOGFILE=/home/johannes/.var/log/${DATE}-backup.log
+LOGFILE=/home/johannes/.var/log/manual-backup-${DATE}.log
 touch $LOGFILE 
 echo "--------------------------------------------------------------------" >> $LOGFILE
 for repo in $(find /home/johannes -type d -name '.jr_backup'); do
diff --git a/push_backup_git.sh b/push_backup_git.sh
index 4280b52..0bdfc8d 100644
--- a/push_backup_git.sh
+++ b/push_backup_git.sh
@@ -1,6 +1,6 @@
 #/bin/bash`
 DATE=$(date +%Y%m%d-%Hh%M)
-LOGFILE=/home/johannes/.var/log/push-${DATE}-backup.log
+LOGFILE=/home/johannes/.var/log/push-backup-${DATE}.log
 for d in $(find -type d -name '.jr_backup'); do
     printf "%s: " $repo >> $LOGFILE
     git -C ${repo}/.. push origin main >> $LOGFILE 2>&1
diff --git a/root_backup_git.sh b/root_backup_git.sh
index ba90137..04f3ae2 100644
--- a/root_backup_git.sh
+++ b/root_backup_git.sh
@@ -1,9 +1,7 @@
 #!/bin/bash
 DATE=$(date +%Y%m%d-%Hh%M)
-LOGFILE=/home/johannes/.var/log/root-${DATE}-backup.log
-touch $LOGFILE 2>&1 
-pushd /etc
-sudo git add /etc/* >> $LOGFILE 2>&1 
-sudo git commit -m "backup-${DATE}" >> $LOGFILE 2>&1 
-sudo chown -R johannes:johannes .git >> $LOGFILE 2>&1
-popd
+LOGFILE=/home/johannes/.var/log/root-backup-${DATE}.log
+touch $LOGFILE 
+sudo git -C /etc add /etc >> $LOGFILE 2>&1 
+sudo git -C /etc commit -m "backup-$DATE" >> $LOGFILE 2>&1 
+sudo chown -R johannes:johannes /etc/.git >> $LOGFILE 2>&1
diff --git a/user_backup_git.sh b/user_backup_git.sh
index ccd8b05..1757169 100644
--- a/user_backup_git.sh
+++ b/user_backup_git.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 #
 DATE=$(date +%Y%m%d-%Hh%M)
-LOGFILE=/home/johannes/.var/log/${DATE}-user-backup.log
+LOGFILE=/home/johannes/.var/log/user-backup-${DATE}.log
 touch $LOGFILE 
-echo "--------------------------------------------------------------------" >> $LOGFILE 2>&1
+echo "--------------------------------------------------------------------" >> $LOGFILE 
 for repo in $(find /home/johannes -type d -name '.jr_backup'); do
-    git -C $repo/.. add $repo/../* >> $LOGFILE 2>&1
+    git -C $repo/.. add $repo/.. >> $LOGFILE 2>&1
     git -C $repo/.. commit -m "backup-${DATE}" >> $LOGFILE 2>&1
     sudo chown -R johannes:johannes $repo/..
-    printf "\n\n\n" >> $LOGFILE 2>&1
+    printf "\n\n\n" >> $LOGFILE 
 done
-echo "--------------------------------------------------------------------" >> $LOGFILE 2>&1
+echo "--------------------------------------------------------------------" >> $LOGFILE