From 8fdff8b3c15c3f7004dc1fd661b9710613707aa0 Mon Sep 17 00:00:00 2001
From: waveshare <2853908288@qq.com>
Date: Fri, 28 Dec 2018 09:40:07 +0000
Subject: [PATCH] Repair bug

---
 LCD101-1024x600-show    |  8 ++++++--
 LCD35-HDMI-480x320-show |  7 +++++++
 LCD35-HDMI-800x480-show |  8 ++++++++
 LCD4-800x480-show       | 12 +++++++++---
 LCD43-show              | 12 +++++++++---
 LCD43-show-V2           | 12 +++++++++---
 LCD5-show               | 13 +++++++++----
 LCD7-1024x600-show      | 11 +++++++++--
 LCD7-800x480-show       | 12 ++++++++----
 9 files changed, 74 insertions(+), 21 deletions(-)

diff --git a/LCD101-1024x600-show b/LCD101-1024x600-show
index 94a37ab..c6e7f65 100755
--- a/LCD101-1024x600-show
+++ b/LCD101-1024x600-show
@@ -68,10 +68,14 @@ sudo cp ./boot/config-101-1024x600.txt-270 /boot/config.txt
 echo "LCD configrue 270"
 fi
 
-#sudo cp ./cmdline.txt /boot/
-#sudo cp ./inittab /etc/
 #sudo cp -rf ./usr/share/X11/xorg.conf.d/99-fbturbo.conf-HDMI /usr/share/X11/xorg.conf.d/99-fbturbo.conf 
+if [ -b /dev/mmcblk0p7 ]; then
+sudo cp ./cmdline.txt-noobs /boot/cmdline.txt
+else
+sudo cp ./cmdline.txt /boot/
+fi
 
+sudo cp ./inittab /etc/
 
 if test "$#" = "0" -o "$1" = "0" -o "$1" = "90"  -o "$1" = "180" -o "$1" = "270" -o "$2" = "0" -o "$2" = "90"  -o "$2" = "180" -o "$2" = "270" -o "$1" = "lite" -o "$2" = "lite"; then
 sudo reboot
diff --git a/LCD35-HDMI-480x320-show b/LCD35-HDMI-480x320-show
index c41ddeb..1d8a251 100755
--- a/LCD35-HDMI-480x320-show
+++ b/LCD35-HDMI-480x320-show
@@ -68,6 +68,13 @@ echo "LCD configrue 270"
 fi
 
 #sudo cp -rf ./usr/share/X11/xorg.conf.d/99-fbturbo.conf-HDMI /usr/share/X11/xorg.conf.d/99-fbturbo.conf 
+if [ -b /dev/mmcblk0p7 ]; then
+sudo cp ./cmdline.txt-noobs /boot/cmdline.txt
+else
+sudo cp ./cmdline.txt /boot/
+fi
+
+sudo cp ./inittab /etc/
 
 if test "$#" = "0" -o "$1" = "0" -o "$1" = "90"  -o "$1" = "180" -o "$1" = "270" -o "$2" = "0" -o "$2" = "90"  -o "$2" = "180" -o "$2" = "270" -o "$1" = "lite" -o "$2" = "lite"; then
 sudo reboot
diff --git a/LCD35-HDMI-800x480-show b/LCD35-HDMI-800x480-show
index 691b160..da8c946 100755
--- a/LCD35-HDMI-800x480-show
+++ b/LCD35-HDMI-800x480-show
@@ -68,6 +68,14 @@ if test "$j" = "kali" ;then
 sudo cp ./usr/share/X11/xorg.conf.d/99-fbturbo.conf-kali-HDMI /usr/share/X11/xorg.conf.d/99-fbturbo.conf
 fi
 
+if [ -b /dev/mmcblk0p7 ]; then
+sudo cp ./cmdline.txt-noobs /boot/cmdline.txt
+else
+sudo cp ./cmdline.txt /boot/
+fi
+
+sudo cp ./inittab /etc/
+
 if test "$#" = "0" -o "$1" = "0" -o "$1" = "90"  -o "$1" = "180" -o "$1" = "270" -o "$2" = "0" -o "$2" = "90"  -o "$2" = "180" -o "$2" = "270" -o "$1" = "lite" -o "$2" = "lite"; then
 sudo reboot
 echo "reboot now"
diff --git a/LCD4-800x480-show b/LCD4-800x480-show
index ff26397..272c8c6 100755
--- a/LCD4-800x480-show
+++ b/LCD4-800x480-show
@@ -64,14 +64,20 @@ echo "LCD configrue 270"
 fi
 
 
-
-#sudo cp ./cmdline.txt /boot/
-#sudo cp ./inittab /etc/
 sudo cp -rf ./usr/share/X11/xorg.conf.d/99-fbturbo.conf-HDMI /usr/share/X11/xorg.conf.d/99-fbturbo.conf 
 if test "$j" = "kali" ;then
 sudo cp ./usr/share/X11/xorg.conf.d/99-fbturbo.conf-kali-HDMI /usr/share/X11/xorg.conf.d/99-fbturbo.conf
 fi
 
+if [ -b /dev/mmcblk0p7 ]; then
+sudo cp ./cmdline.txt-noobs /boot/cmdline.txt
+else
+sudo cp ./cmdline.txt /boot/
+fi
+
+sudo cp ./inittab /etc/
+
+
 if test "$#" = "0" -o "$1" = "0" -o "$1" = "90"  -o "$1" = "180" -o "$1" = "270" -o "$2" = "0" -o "$2" = "90"  -o "$2" = "180" -o "$2" = "270" -o "$1" = "lite" -o "$2" = "lite"; then
 sudo reboot
 echo "reboot now"
diff --git a/LCD43-show b/LCD43-show
index 498b63e..4ed3145 100755
--- a/LCD43-show
+++ b/LCD43-show
@@ -64,14 +64,20 @@ echo "LCD configrue 270"
 fi
 
 
-
-#sudo cp ./cmdline.txt /boot/
-#sudo cp ./inittab /etc/
 sudo cp -rf ./usr/share/X11/xorg.conf.d/99-fbturbo.conf-HDMI /usr/share/X11/xorg.conf.d/99-fbturbo.conf 
 if test "$j" = "kali" ;then
 sudo cp ./usr/share/X11/xorg.conf.d/99-fbturbo.conf-kali-HDMI /usr/share/X11/xorg.conf.d/99-fbturbo.conf
 fi
 
+if [ -b /dev/mmcblk0p7 ]; then
+sudo cp ./cmdline.txt-noobs /boot/cmdline.txt
+else
+sudo cp ./cmdline.txt /boot/
+fi
+
+sudo cp ./inittab /etc/
+
+
 if test "$#" = "0" -o "$1" = "0" -o "$1" = "90"  -o "$1" = "180" -o "$1" = "270" -o "$2" = "0" -o "$2" = "90"  -o "$2" = "180" -o "$2" = "270" -o "$1" = "lite" -o "$2" = "lite"; then
 sudo reboot
 echo "reboot now"
diff --git a/LCD43-show-V2 b/LCD43-show-V2
index 21778d9..3f59bd1 100755
--- a/LCD43-show-V2
+++ b/LCD43-show-V2
@@ -64,14 +64,20 @@ echo "LCD configrue 270"
 fi
 
 
-
-#sudo cp ./cmdline.txt /boot/
-#sudo cp ./inittab /etc/
 sudo cp -rf ./usr/share/X11/xorg.conf.d/99-fbturbo.conf-HDMI /usr/share/X11/xorg.conf.d/99-fbturbo.conf 
 if test "$j" = "kali" ;then
 sudo cp ./usr/share/X11/xorg.conf.d/99-fbturbo.conf-kali-HDMI /usr/share/X11/xorg.conf.d/99-fbturbo.conf
 fi
 
+if [ -b /dev/mmcblk0p7 ]; then
+sudo cp ./cmdline.txt-noobs /boot/cmdline.txt
+else
+sudo cp ./cmdline.txt /boot/
+fi
+
+sudo cp ./inittab /etc/
+
+
 if test "$#" = "0" -o "$1" = "0" -o "$1" = "90"  -o "$1" = "180" -o "$1" = "270" -o "$2" = "0" -o "$2" = "90"  -o "$2" = "180" -o "$2" = "270" -o "$1" = "lite" -o "$2" = "lite"; then
 sudo reboot
 echo "reboot now"
diff --git a/LCD5-show b/LCD5-show
index e592991..b1ff029 100755
--- a/LCD5-show
+++ b/LCD5-show
@@ -63,15 +63,20 @@ sudo cp ./boot/config-5.txt-270 /boot/config.txt
 echo "LCD configrue 270"
 fi
 
-
-
-#sudo cp ./cmdline.txt /boot/
-#sudo cp ./inittab /etc/
 sudo cp -rf ./usr/share/X11/xorg.conf.d/99-fbturbo.conf-HDMI /usr/share/X11/xorg.conf.d/99-fbturbo.conf 
 if test "$j" = "kali" ;then
 sudo cp ./usr/share/X11/xorg.conf.d/99-fbturbo.conf-kali-HDMI /usr/share/X11/xorg.conf.d/99-fbturbo.conf
 fi
 
+if [ -b /dev/mmcblk0p7 ]; then
+sudo cp ./cmdline.txt-noobs /boot/cmdline.txt
+else
+sudo cp ./cmdline.txt /boot/
+fi
+
+sudo cp ./inittab /etc/
+
+
 if test "$#" = "0" -o "$1" = "0" -o "$1" = "90"  -o "$1" = "180" -o "$1" = "270" -o "$2" = "0" -o "$2" = "90"  -o "$2" = "180" -o "$2" = "270" -o "$1" = "lite" -o "$2" = "lite"; then
 sudo reboot
 echo "reboot now"
diff --git a/LCD7-1024x600-show b/LCD7-1024x600-show
index e8df703..ac8af8e 100755
--- a/LCD7-1024x600-show
+++ b/LCD7-1024x600-show
@@ -64,13 +64,20 @@ echo "LCD configrue 270"
 fi
 
 
-#sudo cp ./cmdline.txt /boot/
-#sudo cp ./inittab /etc/
+
 sudo cp -rf ./usr/share/X11/xorg.conf.d/99-fbturbo.conf-HDMI /usr/share/X11/xorg.conf.d/99-fbturbo.conf 
 if test "$j" = "kali" ;then
 sudo cp ./usr/share/X11/xorg.conf.d/99-fbturbo.conf-kali-HDMI /usr/share/X11/xorg.conf.d/99-fbturbo.conf
 fi
 
+if [ -b /dev/mmcblk0p7 ]; then
+sudo cp ./cmdline.txt-noobs /boot/cmdline.txt
+else
+sudo cp ./cmdline.txt /boot/
+fi
+
+sudo cp ./inittab /etc/
+
 if test "$#" = "0" -o "$1" = "0" -o "$1" = "90"  -o "$1" = "180" -o "$1" = "270" -o "$2" = "0" -o "$2" = "90"  -o "$2" = "180" -o "$2" = "270" -o "$1" = "lite" -o "$2" = "lite"; then
 sudo reboot
 echo "reboot now"
diff --git a/LCD7-800x480-show b/LCD7-800x480-show
index bf6f30e..8d295b8 100755
--- a/LCD7-800x480-show
+++ b/LCD7-800x480-show
@@ -63,15 +63,19 @@ sudo cp ./boot/config-7-800x480.txt-270 /boot/config.txt
 echo "LCD configrue 270"
 fi
 
-
-
-#sudo cp ./cmdline.txt /boot/
-#sudo cp ./inittab /etc/
 sudo cp -rf ./usr/share/X11/xorg.conf.d/99-fbturbo.conf-HDMI /usr/share/X11/xorg.conf.d/99-fbturbo.conf 
 if test "$j" = "kali" ;then
 sudo cp ./usr/share/X11/xorg.conf.d/99-fbturbo.conf-kali-HDMI /usr/share/X11/xorg.conf.d/99-fbturbo.conf
 fi
 
+if [ -b /dev/mmcblk0p7 ]; then
+sudo cp ./cmdline.txt-noobs /boot/cmdline.txt
+else
+sudo cp ./cmdline.txt /boot/
+fi
+
+sudo cp ./inittab /etc/
+
 if test "$#" = "0" -o "$1" = "0" -o "$1" = "90"  -o "$1" = "180" -o "$1" = "270" -o "$2" = "0" -o "$2" = "90"  -o "$2" = "180" -o "$2" = "270" -o "$1" = "lite" -o "$2" = "lite"; then
 sudo reboot
 echo "reboot now"