From 649b1a16f86cb80764c74ff655f89c1142bad56c Mon Sep 17 00:00:00 2001
From: openoms <openoms@riseup.net>
Date: Sun, 3 Feb 2019 19:26:00 +0000
Subject: [PATCH] proceed with installing deafult LCD without asking during
 SDcard.build

---
 build.sdcard/raspbianStretchDesktop.sh     | 42 +++++++++++-----------
 dietpi/boot/Automation_Custom_PreScript.sh |  1 +
 2 files changed, 23 insertions(+), 20 deletions(-)
 create mode 100644 dietpi/boot/Automation_Custom_PreScript.sh

diff --git a/build.sdcard/raspbianStretchDesktop.sh b/build.sdcard/raspbianStretchDesktop.sh
index 7d1f43b52..a5393ab5a 100644
--- a/build.sdcard/raspbianStretchDesktop.sh
+++ b/build.sdcard/raspbianStretchDesktop.sh
@@ -552,28 +552,30 @@ read key
 sudo raspi-config nonint do_hostname "RaspiBlitz"
 
 # *** Display selection ***
-dialog --title "Display" --yesno "Are you using the default display available from Amazon?\nSelect 'No' if you are using the Swiss version from play-zone.ch!" 6 80
-defaultDisplay=$?
+#dialog --title "Display" --yesno "Are you using the default display available from Amazon?\nSelect 'No' if you are using the Swiss version from play-zone.ch!" 6 80
+#defaultDisplay=$?
 
-if [[ $defaultDisplay -eq 0 ]]
-then
+# choosing between LCD-s during install makes dietpi automation stop - procedd with default LCD
+
+#if [[ $defaultDisplay -eq 0 ]]
+#then
   # *** RASPIBLITZ / LCD (at last - because makes a reboot) ***
   # based on https://www.elegoo.com/tutorial/Elegoo%203.5%20inch%20Touch%20Screen%20User%20Manual%20V1.00.2017.10.09.zip
-  cd /home/admin/
-  sudo apt-mark hold raspberrypi-bootloader
-  git clone https://github.com/goodtft/LCD-show.git
-  sudo chmod -R 755 LCD-show
-  sudo chown -R admin:admin LCD-show
-  cd LCD-show/
-  sudo ./LCD35-show
-else
-  # Download and install the driver
-  # based on http://www.raspberrypiwiki.com/index.php/3.5_inch_TFT_800x480@60fps
-
-  cd /boot
-  sudo wget http://www.raspberrypiwiki.com/download/RPI-HD-35-INCH-TFT/dt-blob-For-3B-plus.bin
-  sudo mv dt-blob-For-3B-plus.bin dt-blob.bin
-  cat <<EOF >> config.txt
+cd /home/admin/
+sudo apt-mark hold raspberrypi-bootloader
+git clone https://github.com/goodtft/LCD-show.git
+sudo chmod -R 755 LCD-show
+sudo chown -R admin:admin LCD-show
+cd LCD-show/
+sudo ./LCD35-show
+#else
+#  # Download and install the driver
+#  # based on http://www.raspberrypiwiki.com/index.php/3.5_inch_TFT_800x480@60fps
+#
+#  cd /boot
+#  sudo wget http://www.raspberrypiwiki.com/download/RPI-HD-35-INCH-TFT/dt-blob-For-3B-plus.bin
+#  sudo mv dt-blob-For-3B-plus.bin dt-blob.bin
+#  cat <<EOF >> config.txt
 
 dtparam=spi=off
 dtparam=i2c_arm=off
@@ -602,4 +604,4 @@ display_rotate=3
 dtoverlay=i2c-gpio,i2c_gpio_scl=24,i2c_gpio_sda=23
 EOF
   init 6
-fi
+#fi
diff --git a/dietpi/boot/Automation_Custom_PreScript.sh b/dietpi/boot/Automation_Custom_PreScript.sh
new file mode 100644
index 000000000..95b41a65f
--- /dev/null
+++ b/dietpi/boot/Automation_Custom_PreScript.sh
@@ -0,0 +1 @@
+dietpi-update