change compare operators, add some logs with echo

build_sdcard.sh

@@ -848,7 +848,7 @@ if [ "${display}" != "headless" ] || [ "${baseimage}" = "raspios_arm64" ]; then
   echo "*** ADDITIONAL DISPLAY OPTIONS ***"
   echo "- calling: blitz.display.sh set-display ${display}"
   /home/admin/config.scripts/blitz.display.sh set-display ${display}
-  /home/admin/config.scripts/blitz.display.sh rotate 1
+  [ "${display}" == "lcd35"] && /home/admin/config.scripts/blitz.display.sh rotate 1
 fi
 
 echo "# BUILD DONE - see above"

home.admin/config.scripts/blitz.display.sh

@@ -13,7 +13,7 @@ if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
   echo "# sudo blitz.display.sh rotate [on|off]"
   echo "# sudo blitz.display.sh test-lcd-connect"
   echo "# sudo blitz.display.sh set-display [hdmi|lcd35|lcd20|headless]"
-  echo "# sudo blitz.display.sh prepare-install"
+  echo "# sudo blitz.display.sh prepare-install [lcd35|lcd20]"
   exit 1
 fi
 
@@ -198,11 +198,11 @@ if [ "${command}" == "test-lcd-connect" ]; then
 fi
 
 function prepareinstall() {
-  lcd_type=${1:-lcd35}
+  lcd_type=${1}
   lcd_driver_repo="https://github.com/tux1c/wavesharelcd-64bit-rpi.git"
   lcd_driver_dir="wavesharelcd-64bit-rpi"
 
-  if [ "$lcd_type" = "lcd20" ]; then
+  if [ "$lcd_type" == "lcd20" ]; then
     lcd_driver_repo="https://github.com/semafelectronics/raspiblitz20lcd.git"
     lcd_driver_dir="raspiblitz20lcd"
   fi
@@ -259,19 +259,19 @@ function install_lcd() {
 
     lcd_driver_dir="wavesharelcd-64bit-rpi"
 
-    [ "$lcd_type" = "lcd20" ] && lcd_driver_dir="raspiblitz20lcd"
+    [ "$lcd_type" == "lcd20" ] && lcd_driver_dir="raspiblitz20lcd"
 
     cd /home/admin/$lcd_driver_dir
 
     sudo -u admin git checkout master
 
-    if [ "$lcd_type" = "lcd35" ]; then
-	sudo -u admin git reset --hard 5a206a7 || exit 1
+    if [ "$lcd_type" == "lcd35" ]; then
+	      sudo -u admin git reset --hard 5a206a7 || exit 1
     fi
     sudo -u admin /home/admin/config.scripts/blitz.git-verify.sh \
      'GitHub' 'https://github.com/web-flow.gpg' '4AEE18F83AFDEB23' || exit 1
 
-    if [ "$lcd_type" = "lcd35" ]; then
+    if [ "$lcd_type" == "lcd35" ]; then
       # customized from https://github.com/tux1c/wavesharelcd-64bit-rpi/blob/master/install.sh
       # prepare X11
       mkdir -p /etc/X11/xorg.conf.d
@@ -300,7 +300,7 @@ function install_lcd() {
     # echo "enable_uart=1" >> /boot/config.txt
     sed -i "s/^dtoverlay=.*//g" /boot/config.txt 
 
-    if [ "$lcd_type" = "lcd35" ]; then
+    if [ "$lcd_type" == "lcd35" ]; then
       echo "dtoverlay=waveshare35a:rotate=90" >> /boot/config.txt
     else
       echo "dtoverlay=waveshare20lcd" >> /boot/config.txt
@@ -322,9 +322,12 @@ function install_lcd() {
       exit 1
     fi
 
-    # touch screen calibration
-    apt-get install -y xserver-xorg-input-evdev
-    cp -rf /usr/share/X11/xorg.conf.d/10-evdev.conf /usr/share/X11/xorg.conf.d/45-evdev.conf
+    if [ "$lcd_type" == "lcd35" ]; then
+      # touch screen calibration
+      apt-get install -y xserver-xorg-input-evdev
+      cp -rf /usr/share/X11/xorg.conf.d/10-evdev.conf /usr/share/X11/xorg.conf.d/45-evdev.conf
+    fi
+
     # TODO manual touchscreen calibration option
     # https://github.com/tux1c/wavesharelcd-64bit-rpi#adapting-guide-to-other-lcds
 
@@ -371,7 +374,7 @@ function uninstall_lcd() {
     sed -i "s/ dwc_otg.lpm_enable=0 quiet fbcon=map:10 fbcon=font:ProFont6x11 logo.nologo//g" /boot/cmdline.txt
 
     # un-prepare X11
-    if [ "$lcd_type" = "lcd35" ]; then
+    if [ "$lcd_type" == "lcd35" ]; then
       mv /home/admin/wavesharelcd-64bit-rpi/40-libinput.conf /etc/X11/xorg.conf.d/40-libinput.conf 2>/dev/null
       rm -rf /etc/X11/xorg.conf.d/99-calibration.conf 2>/dev/null
 

home.admin/config.scripts/blitz.fatpack.sh

@@ -10,6 +10,7 @@ if [ "$EUID" -ne 0 ]
 fi
 
 # make sure LCD is on (default for fatpack)
+echo "# Calling blitz.display.sh set-display "$1" from blitz.fatpack.sh (1)"
 /home/admin/config.scripts/blitz.display.sh set-display "$1"
 
 # check if sd card needs expansion before fatpack
@@ -110,4 +111,5 @@ echo "* Adding Code&Compile for WEBUI-APP: MEMPOOL"
 /home/admin/config.scripts/bonus.mempool.sh install || exit 1
 
 # set default display to LCD
+echo "# Calling blitz.display.sh set-display "${display}" from blitz.fatpack.sh (2)"
 sudo /home/admin/config.scripts/blitz.display.sh set-display ${display}