From 8ce103f889af0049cf7a45f29d1df2bd765fccd0 Mon Sep 17 00:00:00 2001
From: /rootzoll <christian@geektank.de>
Date: Wed, 21 Dec 2022 17:34:38 +0100
Subject: [PATCH] prevent checkout hook (#3560)

* modify dev notes

* display recover during lean-build

* prevent hooks

* prevent hook
---
 alternative.platforms/display.alternatives.sh |  4 ++--
 home.admin/config.scripts/blitz.display.sh    | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)
 mode change 100755 => 100644 home.admin/config.scripts/blitz.display.sh

diff --git a/alternative.platforms/display.alternatives.sh b/alternative.platforms/display.alternatives.sh
index 337773523..d27a16411 100644
--- a/alternative.platforms/display.alternatives.sh
+++ b/alternative.platforms/display.alternatives.sh
@@ -55,7 +55,7 @@ if [ "${CHOICE}" = "GPIO" ]; then
     sudo apt-mark hold raspberrypi-bootloader
     sudo ./LCD35-show
   else
-    sudo rm -rf /etc/X11/xorg.conf.d/40-libinput.conf
+    sudo rm -rf /etc/X11/xorg.conf.d/40-libinput.conf 2>/dev/null
     sudo mkdir /etc/X11/xorg.conf.d
     sudo cp ./usr/tft35a-overlay.dtb /boot/overlays/
     sudo cp ./usr/tft35a-overlay.dtb /boot/overlays/tft35a.dtbo
@@ -79,7 +79,7 @@ elif [ "${CHOICE}" = "HDMI" ]; then
   sudo chmod -R 755 LCD-show
   cd LCD-show/
   #sudo ./MPI3508-show  
-  sudo rm -rf /etc/X11/xorg.conf.d/40-libinput.conf
+  sudo rm -rf /etc/X11/xorg.conf.d/40-libinput.conf 2>/dev/null
   
   if [ "${baseimage}" != "dietpi" ]; then
     sudo cp -rf ./boot/config-35-480X320.txt /boot/config.txt  
diff --git a/home.admin/config.scripts/blitz.display.sh b/home.admin/config.scripts/blitz.display.sh
old mode 100755
new mode 100644
index d97b21f8a..268ba455d
--- a/home.admin/config.scripts/blitz.display.sh
+++ b/home.admin/config.scripts/blitz.display.sh
@@ -138,9 +138,9 @@ if [ "${command}" == "rotate" ]; then
     # change rotation config
     echo "# Turn ON: LCD ROTATE"
     sed -i "s/^dtoverlay=.*/dtoverlay=waveshare35a:rotate=90/g" /boot/config.txt
-    rm /etc/X11/xorg.conf.d/40-libinput.conf >/dev/null
+    rm /etc/X11/xorg.conf.d/40-libinput.conf 2>/dev/null
 
-    /home/admin/config.scripts/blitz.conf.sh set lcdrotate 1
+    /home/admin/config.scripts/blitz.conf.sh set lcdrotate 1 2>/dev/null
     echo "# OK - a restart is needed: sudo shutdown -r now"
 
   # TURN ROTATE OFF
@@ -165,7 +165,7 @@ EOF
     fi
 
     # update raspiblitz conf
-    /home/admin/config.scripts/blitz.conf.sh set lcdrotate 0  
+    /home/admin/config.scripts/blitz.conf.sh set lcdrotate 0 2>/dev/null
     echo "OK - a restart is needed: sudo shutdown -r now"
 
   else
@@ -202,7 +202,7 @@ function prepareinstall() {
   if [ ${repoCloned} -lt 1 ]; then
     echo "# clone/download https://github.com/tux1c/wavesharelcd-64bit-rpi.git"
     cd /home/admin/
-    sudo -u admin git clone https://github.com/tux1c/wavesharelcd-64bit-rpi.git
+    sudo -u admin git clone --no-checkout https://github.com/tux1c/wavesharelcd-64bit-rpi.git
     sudo -u admin chmod -R 755 wavesharelcd-64bit-rpi
     sudo -u admin chown -R admin:admin wavesharelcd-64bit-rpi
   else
@@ -247,6 +247,7 @@ function install_lcd() {
     # Downloading LCD Driver from Github
     prepareinstall
     cd /home/admin/wavesharelcd-64bit-rpi
+    sudo -u admin git checkout master
     sudo -u admin git reset --hard 5a206a7 || exit 1
     sudo -u admin /home/admin/config.scripts/blitz.git-verify.sh \
      'GitHub' 'https://github.com/web-flow.gpg' '4AEE18F83AFDEB23' || exit 1
@@ -480,7 +481,7 @@ if [ "${command}" == "set-display" ]; then
   fi
 
   # mark new display class in config (if exist)
-  /home/admin/config.scripts/blitz.conf.sh set displayClass ${paramDisplayClass}
+  /home/admin/config.scripts/blitz.conf.sh set displayClass ${paramDisplayClass} 2>/dev/null
   sed -i "s/^displayClass=.*/displayClass=${paramDisplayClass}/g" /home/admin/raspiblitz.info
   exit 0