From d33f94c1b06736fe3734a936364697bd270e49c7 Mon Sep 17 00:00:00 2001
From: Bennett-Wendorf <bennettwendorf@gmail.com>
Date: Sun, 9 Jan 2022 10:52:37 -0600
Subject: [PATCH] Backup custom configs in /etc/X11/xorg.conf.d and remove need
 for dpkg

---
 system_backup.sh  |  9 +++++----
 system_restore.sh | 24 ++++++++++++------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/system_backup.sh b/system_backup.sh
index 8317899..1f40f4e 100755
--- a/system_backup.sh
+++ b/system_backup.sh
@@ -17,6 +17,7 @@ fi
 
 if [ -d /etc/X11/xorg.conf.d ]; then
 sudo mkdir -p ./.system_backup/xorg.conf.d
+sudo cp -r /etc/X11/xorg.conf.d/* ./.system_backup/xorg.conf.d
 sudo rm -rf /etc/X11/xorg.conf.d
 fi
 
@@ -46,12 +47,12 @@ fi
 if [ -f /usr/share/X11/xorg.conf.d/99-fbturbo.conf ]; then
 sudo cp -rf /usr/share/X11/xorg.conf.d/99-fbturbo.conf ./.system_backup/
 fi
-sudo cp -rf ./usr/99-fbturbo.conf-original /usr/share/X11/xorg.conf.d/99-fbturbo.conf
+#sudo cp -rf ./usr/99-fbturbo.conf-original /usr/share/X11/xorg.conf.d/99-fbturbo.conf
 sudo cp -rf /etc/rc.local ./.system_backup/
-sudo cp -rf ./etc/rc.local-original /etc/rc.local
+#sudo cp -rf ./etc/rc.local-original /etc/rc.local
 
 sudo cp -rf /etc/modules ./.system_backup/
-sudo cp -rf ./etc/modules-original /etc/modules
+#sudo cp -rf ./etc/modules-original /etc/modules
 
 if [ -f /etc/modprobe.d/fbtft.conf ]; then
 sudo cp -rf /etc/modprobe.d/fbtft.conf ./.system_backup
@@ -79,7 +80,7 @@ fi
 
 if [ -f /usr/share/X11/xorg.conf.d/10-evdev.conf ]; then
 sudo cp -rf /usr/share/X11/xorg.conf.d/10-evdev.conf ./.system_backup
-sudo dpkg -P xserver-xorg-input-evdev
+#sudo dpkg -P xserver-xorg-input-evdev
 #sudo apt-get purge xserver-xorg-input-evdev -y  2> error_output.txt
 #result=`cat ./error_output.txt`
 #echo -e "\033[31m$result\033[0m"
diff --git a/system_restore.sh b/system_restore.sh
index 964af86..548f4f1 100755
--- a/system_restore.sh
+++ b/system_restore.sh
@@ -69,18 +69,18 @@ fi
 #echo -e "\033[31m$result\033[0m"
 #fi
 
-if [ -f /usr/share/X11/xorg.conf.d/10-evdev.conf ]; then
-sudo dpkg -P xserver-xorg-input-evdev
-#sudo apt-get purge xserver-xorg-input-evdev -y 2> error_output.txt
-#result=`cat ./error_output.txt`
-#echo -e "\033[31m$result\033[0m"
-fi
-if [ -f ./.system_backup/10-evdev.conf ]; then
-sudo dpkg -i -B ./xserver-xorg-input-evdev_1%3a2.10.6-1+b1_armhf.deb
-#sudo apt-get install xserver-xorg-input-evdev -y 2> error_output.txt
-#result=`cat ./error_output.txt`
-#echo -e "\033[31m$result\033[0m"
-fi
+# if [ -f /usr/share/X11/xorg.conf.d/10-evdev.conf ]; then
+# sudo dpkg -P xserver-xorg-input-evdev
+# #sudo apt-get purge xserver-xorg-input-evdev -y 2> error_output.txt
+# #result=`cat ./error_output.txt`
+# #echo -e "\033[31m$result\033[0m"
+# fi
+# if [ -f ./.system_backup/10-evdev.conf ]; then
+# sudo dpkg -i -B ./xserver-xorg-input-evdev_1%3a2.10.6-1+b1_armhf.deb
+# #sudo apt-get install xserver-xorg-input-evdev -y 2> error_output.txt
+# #result=`cat ./error_output.txt`
+# #echo -e "\033[31m$result\033[0m"
+# fi
 
 if [ -f /usr/share/X11/xorg.conf.d/45-evdev.conf ]; then
 sudo rm -rf /usr/share/X11/xorg.conf.d/45-evdev.conf