diff --git a/LCD154-show b/LCD154-show index c80ef45..73b6fbd 100755 --- a/LCD154-show +++ b/LCD154-show @@ -39,9 +39,19 @@ sudo cp -rf ./boot/config.txt.bak /boot/config.txt #fi #sudo cp ./usr/inittab /etc/ #sudo cp ./boot/config-mhs35.txt /boot/config.txt + +if [[ "$deb_version" = "13.1" ]] || [[ "$deb_version" > "13.1" ]]; then +sudo cp -rf ./usr/99-fbturbo-fbcp.conf /usr/share/X11/xorg.conf.d/99-fbturbo.~ +sudo cp -rf ./etc/.bash_profile /home/$username/ + +#sudo cp -rf ./etc/rc_x11.local /etc/rc.local +fi + + sudo touch ./.have_installed echo "gpio:resistance:LCD154:90:300:300" > ./.have_installed +if [[ "$deb_version" < "13.1" ]]; then #FBCP install if [ -d ./fbcp-ili9341 ]; then sudo rm -rf ./fbcp-ili9341 @@ -75,6 +85,7 @@ cd - > /dev/null sudo cp -rf ./etc/rc.local /etc/rc.local fi fi +fi #KEY install wget --spider -q -o /dev/null --tries=1 -T 10 http://mirrors.zju.edu.cn diff --git a/LCD24-3A+-show b/LCD24-3A+-show index 0462bc2..6e0a1bb 100755 --- a/LCD24-3A+-show +++ b/LCD24-3A+-show @@ -35,16 +35,27 @@ sudo cp -rf ./usr/99-calibration.conf-32-90 /etc/X11/xorg.conf.d/99-calibration if [[ "$deb_version" < "12.1" ]]; then sudo cp -rf ./usr/99-fbturbo.conf /usr/share/X11/xorg.conf.d/99-fbturbo.conf fi + +if [[ "$deb_version" = "13.1" ]] || [[ "$deb_version" > "13.1" ]]; then +sudo cp -rf ./usr/99-fbturbo-fbcp.conf /usr/share/X11/xorg.conf.d/99-fbturbo.~ +sudo cp -rf ./etc/.bash_profile /home/$username/ + +#sudo cp -rf ./etc/rc_x11.local /etc/rc.local +fi + #if test "$root_dev" = "/dev/mmcblk0p7";then #sudo cp ./usr/cmdline.txt-noobs /boot/cmdline.txt #else #sudo cp ./usr/cmdline.txt /boot/ #fi +if [[ "$deb_version" < "13.1" ]]; then sudo cp ./usr/inittab /etc/ +fi #sudo cp ./boot/config-32.txt /boot/config.txt sudo touch ./.have_installed echo "gpio:resistance:32:90:480:360" > ./.have_installed +if [[ "$deb_version" < "13.1" ]]; then if [[ "$deb_version" < "12.10" ]]; then sudo apt-get update fi @@ -89,6 +100,7 @@ fi else echo "bad network, can't install cmake!!!" fi +fi #evdev install #nodeplatform=`uname -n` @@ -97,8 +109,8 @@ version=`uname -v` #if test "$nodeplatform" = "raspberrypi";then #echo "this is raspberrypi kernel" input_result=0 -version=${version##* } -#version=${version#*#} +version=${version##*(} +version=${version%%-*} echo $version if test $version -lt 2017;then echo "reboot" diff --git a/LCD24-show b/LCD24-show index 31f7d80..150c3ae 100755 --- a/LCD24-show +++ b/LCD24-show @@ -35,16 +35,27 @@ sudo cp -rf ./usr/99-calibration.conf-32-270 /etc/X11/xorg.conf.d/99-calibratio if [[ "$deb_version" < "12.1" ]]; then sudo cp -rf ./usr/99-fbturbo.conf /usr/share/X11/xorg.conf.d/99-fbturbo.conf fi + +if [[ "$deb_version" = "13.1" ]] || [[ "$deb_version" > "13.1" ]]; then +sudo cp -rf ./usr/99-fbturbo-fbcp.conf /usr/share/X11/xorg.conf.d/99-fbturbo.~ +sudo cp -rf ./etc/.bash_profile /home/$username/ + +#sudo cp -rf ./etc/rc_x11.local /etc/rc.local +fi + #if test "$root_dev" = "/dev/mmcblk0p7";then #sudo cp ./usr/cmdline.txt-noobs /boot/cmdline.txt #else #sudo cp ./usr/cmdline.txt /boot/ #fi +if [[ "$deb_version" < "13.1" ]]; then sudo cp ./usr/inittab /etc/ +fi #sudo cp ./boot/config-32.txt /boot/config.txt sudo touch ./.have_installed echo "gpio:resistance:32:270:480:360" > ./.have_installed +if [[ "$deb_version" < "13.1" ]]; then if [[ "$deb_version" < "12.10" ]]; then sudo apt-get update fi @@ -89,6 +100,7 @@ fi else echo "bad network, can't install cmake!!!" fi +fi #evdev install #nodeplatform=`uname -n` @@ -97,8 +109,8 @@ version=`uname -v` #if test "$nodeplatform" = "raspberrypi";then #echo "this is raspberrypi kernel" input_result=0 -version=${version##* } -#version=${version#*#} +version=${version##*(} +version=${version%%-*} echo $version if test $version -lt 2017;then echo "reboot" diff --git a/LCD28-show b/LCD28-show index 31f7d80..25f7f1b 100755 --- a/LCD28-show +++ b/LCD28-show @@ -35,16 +35,28 @@ sudo cp -rf ./usr/99-calibration.conf-32-270 /etc/X11/xorg.conf.d/99-calibratio if [[ "$deb_version" < "12.1" ]]; then sudo cp -rf ./usr/99-fbturbo.conf /usr/share/X11/xorg.conf.d/99-fbturbo.conf fi + +if [[ "$deb_version" = "13.1" ]] || [[ "$deb_version" > "13.1" ]]; then +sudo cp -rf ./usr/99-fbturbo-fbcp.conf /usr/share/X11/xorg.conf.d/99-fbturbo.~ +sudo cp -rf ./etc/.bash_profile /home/$username/ + +#sudo cp -rf ./etc/rc_x11.local /etc/rc.local +fi + + #if test "$root_dev" = "/dev/mmcblk0p7";then #sudo cp ./usr/cmdline.txt-noobs /boot/cmdline.txt #else #sudo cp ./usr/cmdline.txt /boot/ #fi +if [[ "$deb_version" < "13.1" ]]; then sudo cp ./usr/inittab /etc/ +fi #sudo cp ./boot/config-32.txt /boot/config.txt sudo touch ./.have_installed echo "gpio:resistance:32:270:480:360" > ./.have_installed +if [[ "$deb_version" < "13.1" ]]; then if [[ "$deb_version" < "12.10" ]]; then sudo apt-get update fi @@ -89,6 +101,7 @@ fi else echo "bad network, can't install cmake!!!" fi +fi #evdev install #nodeplatform=`uname -n` @@ -97,8 +110,8 @@ version=`uname -v` #if test "$nodeplatform" = "raspberrypi";then #echo "this is raspberrypi kernel" input_result=0 -version=${version##* } -#version=${version#*#} +version=${version##*(} +version=${version%%-*} echo $version if test $version -lt 2017;then echo "reboot" diff --git a/LCD32-show b/LCD32-show index 31f7d80..25f7f1b 100755 --- a/LCD32-show +++ b/LCD32-show @@ -35,16 +35,28 @@ sudo cp -rf ./usr/99-calibration.conf-32-270 /etc/X11/xorg.conf.d/99-calibratio if [[ "$deb_version" < "12.1" ]]; then sudo cp -rf ./usr/99-fbturbo.conf /usr/share/X11/xorg.conf.d/99-fbturbo.conf fi + +if [[ "$deb_version" = "13.1" ]] || [[ "$deb_version" > "13.1" ]]; then +sudo cp -rf ./usr/99-fbturbo-fbcp.conf /usr/share/X11/xorg.conf.d/99-fbturbo.~ +sudo cp -rf ./etc/.bash_profile /home/$username/ + +#sudo cp -rf ./etc/rc_x11.local /etc/rc.local +fi + + #if test "$root_dev" = "/dev/mmcblk0p7";then #sudo cp ./usr/cmdline.txt-noobs /boot/cmdline.txt #else #sudo cp ./usr/cmdline.txt /boot/ #fi +if [[ "$deb_version" < "13.1" ]]; then sudo cp ./usr/inittab /etc/ +fi #sudo cp ./boot/config-32.txt /boot/config.txt sudo touch ./.have_installed echo "gpio:resistance:32:270:480:360" > ./.have_installed +if [[ "$deb_version" < "13.1" ]]; then if [[ "$deb_version" < "12.10" ]]; then sudo apt-get update fi @@ -89,6 +101,7 @@ fi else echo "bad network, can't install cmake!!!" fi +fi #evdev install #nodeplatform=`uname -n` @@ -97,8 +110,8 @@ version=`uname -v` #if test "$nodeplatform" = "raspberrypi";then #echo "this is raspberrypi kernel" input_result=0 -version=${version##* } -#version=${version#*#} +version=${version##*(} +version=${version%%-*} echo $version if test $version -lt 2017;then echo "reboot" diff --git a/MHS32-show b/MHS32-show index cacf6bf..a845c5c 100755 --- a/MHS32-show +++ b/MHS32-show @@ -36,16 +36,27 @@ sudo cp -rf ./usr/99-calibration.conf-mhs32-270 /etc/X11/xorg.conf.d/99-calibra if [[ "$deb_version" < "12.1" ]]; then sudo cp -rf ./usr/99-fbturbo.conf /usr/share/X11/xorg.conf.d/99-fbturbo.conf fi + +if [[ "$deb_version" = "13.1" ]] || [[ "$deb_version" > "13.1" ]]; then +sudo cp -rf ./usr/99-fbturbo-fbcp.conf /usr/share/X11/xorg.conf.d/99-fbturbo.~ +sudo cp -rf ./etc/.bash_profile /home/$username/ + +#sudo cp -rf ./etc/rc_x11.local /etc/rc.local +fi + #if test "$root_dev" = "/dev/mmcblk0p7";then #sudo cp ./usr/cmdline.txt-noobs /boot/cmdline.txt #else #sudo cp ./usr/cmdline.txt /boot/ #fi +if [[ "$deb_version" < "13.1" ]]; then sudo cp ./usr/inittab /etc/ +fi #sudo cp ./boot/config-mhs32.txt /boot/config.txt sudo touch ./.have_installed echo "gpio:resistance:mhs32:270:480:360" > ./.have_installed +if [[ "$deb_version" < "13.1" ]]; then if [[ "$deb_version" < "12.10" ]]; then sudo apt-get update fi @@ -90,6 +101,7 @@ fi else echo "bad network, can't install cmake!!!" fi +fi #evdev install #nodeplatform=`uname -n` @@ -98,8 +110,8 @@ version=`uname -v` #if test "$nodeplatform" = "raspberrypi";then #echo "this is raspberrypi kernel" input_result=0 -version=${version##* } -#version=${version#*#} +version=${version##*(} +version=${version%%-*} echo $version if test $version -lt 2017;then echo "reboot" diff --git a/MHS35-show b/MHS35-show index ddcb7b6..cb497b0 100755 --- a/MHS35-show +++ b/MHS35-show @@ -37,16 +37,27 @@ sudo cp -rf ./usr/99-calibration.conf-mhs35-90 /etc/X11/xorg.conf.d/99-calibrat if [[ "$deb_version" < "12.1" ]]; then sudo cp -rf ./usr/99-fbturbo.conf /usr/share/X11/xorg.conf.d/99-fbturbo.conf fi + +if [[ "$deb_version" = "13.1" ]] || [[ "$deb_version" > "13.1" ]]; then +sudo cp -rf ./usr/99-fbturbo-fbcp.conf /usr/share/X11/xorg.conf.d/99-fbturbo.~ +sudo cp -rf ./etc/.bash_profile /home/$username/ + +#sudo cp -rf ./etc/rc_x11.local /etc/rc.local +fi + #if test "$root_dev" = "/dev/mmcblk0p7";then #sudo cp ./usr/cmdline.txt-noobs /boot/cmdline.txt #else #sudo cp ./usr/cmdline.txt /boot/ #fi +if [[ "$deb_version" < "13.1" ]]; then sudo cp ./usr/inittab /etc/ +fi #sudo cp ./boot/config-mhs35.txt /boot/config.txt sudo touch ./.have_installed echo "gpio:resistance:mhs35:90:480:320" > ./.have_installed +if [[ "$deb_version" < "13.1" ]]; then if [[ "$deb_version" < "12.10" ]]; then sudo apt-get update fi @@ -90,6 +101,7 @@ fi else echo "bad network, can't install cmake!!!" fi +fi #evdev install #nodeplatform=`uname -n` @@ -98,8 +110,8 @@ version=`uname -v` #if test "$nodeplatform" = "raspberrypi";then #echo "this is raspberrypi kernel" input_result=0 -version=${version##* } -#version=${version#*#} +version=${version##*(} +version=${version%%-*} echo $version if test $version -lt 2017;then echo "reboot" diff --git a/MHS35B-show b/MHS35B-show index eabe013..f9d4688 100755 --- a/MHS35B-show +++ b/MHS35B-show @@ -43,15 +43,26 @@ sudo cp -rf ./usr/99-calibration.conf-mhs35b-90 /etc/X11/xorg.conf.d/99-calibra if [[ "$deb_version" < "12.1" ]]; then sudo cp -rf ./usr/99-fbturbo.conf /usr/share/X11/xorg.conf.d/99-fbturbo.conf fi + +if [[ "$deb_version" = "13.1" ]] || [[ "$deb_version" > "13.1" ]]; then +sudo cp -rf ./usr/99-fbturbo-fbcp.conf /usr/share/X11/xorg.conf.d/99-fbturbo.~ +sudo cp -rf ./etc/.bash_profile /home/$username/ + +#sudo cp -rf ./etc/rc_x11.local /etc/rc.local +fi + #if test "$root_dev" = "/dev/mmcblk0p7";then #sudo cp ./usr/cmdline.txt-noobs /boot/cmdline.txt #else #sudo cp ./usr/cmdline.txt /boot/ #fi +if [[ "$deb_version" < "13.1" ]]; then sudo cp ./usr/inittab /etc/ +fi sudo touch ./.have_installed echo "gpio:resistance:mhs35b:90:480:320" > ./.have_installed +if [[ "$deb_version" < "13.1" ]]; then if [[ "$deb_version" < "12.10" ]]; then sudo apt-get update fi @@ -96,6 +107,7 @@ fi else echo "bad network, can't install cmake!!!" fi +fi #evdev install #nodeplatform=`uname -n` @@ -104,8 +116,8 @@ version=`uname -v` #if test "$nodeplatform" = "raspberrypi";then #echo "this is raspberrypi kernel" input_result=0 -version=${version##* } -#version=${version#*#} +version=${version##*(} +version=${version%%-*} echo $version if test $version -lt 2017;then echo "reboot" diff --git a/MHS35IPS-show b/MHS35IPS-show index 5289e8c..f3bf11d 100755 --- a/MHS35IPS-show +++ b/MHS35IPS-show @@ -37,16 +37,27 @@ sudo cp -rf ./usr/99-calibration.conf-mhs35ips-90 /etc/X11/xorg.conf.d/99-calib if [[ "$deb_version" < "12.1" ]]; then sudo cp -rf ./usr/99-fbturbo.conf /usr/share/X11/xorg.conf.d/99-fbturbo.conf fi + +if [[ "$deb_version" = "13.1" ]] || [[ "$deb_version" > "13.1" ]]; then +sudo cp -rf ./usr/99-fbturbo-fbcp.conf /usr/share/X11/xorg.conf.d/99-fbturbo.~ +sudo cp -rf ./etc/.bash_profile /home/$username/ + +#sudo cp -rf ./etc/rc_x11.local /etc/rc.local +fi + #if test "$root_dev" = "/dev/mmcblk0p7";then #sudo cp ./usr/cmdline.txt-noobs /boot/cmdline.txt #else #sudo cp ./usr/cmdline.txt /boot/ #fi +if [[ "$deb_version" < "13.1" ]]; then sudo cp ./usr/inittab /etc/ +fi #sudo cp ./boot/config-mhs35.txt /boot/config.txt sudo touch ./.have_installed echo "gpio:resistance:mhs35ips:90:480:320" > ./.have_installed +if [[ "$deb_version" < "13.1" ]]; then if [[ "$deb_version" < "12.10" ]]; then sudo apt-get update fi @@ -90,6 +101,7 @@ fi else echo "bad network, can't install cmake!!!" fi +fi #evdev install #nodeplatform=`uname -n` @@ -98,8 +110,8 @@ version=`uname -v` #if test "$nodeplatform" = "raspberrypi";then #echo "this is raspberrypi kernel" input_result=0 -version=${version##* } -#version=${version#*#} +version=${version##*(} +version=${version%%-*} echo $version if test $version -lt 2017;then echo "reboot" diff --git a/MHS40-show b/MHS40-show index e27db9d..4e0de99 100755 --- a/MHS40-show +++ b/MHS40-show @@ -35,16 +35,27 @@ sudo cp -rf ./usr/99-calibration.conf-mhs395-90 /etc/X11/xorg.conf.d/99-calibra if [[ "$deb_version" < "12.1" ]]; then sudo cp -rf ./usr/99-fbturbo.conf /usr/share/X11/xorg.conf.d/99-fbturbo.conf fi + +if [[ "$deb_version" = "13.1" ]] || [[ "$deb_version" > "13.1" ]]; then +sudo cp -rf ./usr/99-fbturbo-fbcp.conf /usr/share/X11/xorg.conf.d/99-fbturbo.~ +sudo cp -rf ./etc/.bash_profile /home/$username/ + +#sudo cp -rf ./etc/rc_x11.local /etc/rc.local +fi + #if test "$root_dev" = "/dev/mmcblk0p7";then #sudo cp ./usr/cmdline.txt-noobs /boot/cmdline.txt #else #sudo cp ./usr/cmdline.txt /boot/ #fi +if [[ "$deb_version" < "13.1" ]]; then sudo cp ./usr/inittab /etc/ +fi #sudo cp ./boot/config-mhs395.txt /boot/config.txt sudo touch ./.have_installed echo "gpio:resistance:mhs395:90:480:320" > ./.have_installed +if [[ "$deb_version" < "13.1" ]]; then if [[ "$deb_version" < "12.10" ]]; then sudo apt-get update fi @@ -89,6 +100,7 @@ fi else echo "bad network, can't install cmake!!!" fi +fi #evdev install #nodeplatform=`uname -n` @@ -97,8 +109,8 @@ version=`uname -v` #if test "$nodeplatform" = "raspberrypi";then #echo "this is raspberrypi kernel" input_result=0 -version=${version##* } -#version=${version#*#} +version=${version##*(} +version=${version%%-*} echo $version if test $version -lt 2017;then echo "reboot" diff --git a/MHS40C-show b/MHS40C-show index e11bbc8..b257752 100755 --- a/MHS40C-show +++ b/MHS40C-show @@ -36,6 +36,15 @@ sudo cp -rf ./usr/99-calibration.conf-mhs397-0 /etc/X11/xorg.conf.d/99-calibrat if [[ "$deb_version" < "12.1" ]]; then sudo cp -rf ./usr/99-fbturbo-fbcp.conf /usr/share/X11/xorg.conf.d/99-fbturbo.conf fi + +if [[ "$deb_version" = "13.1" ]] || [[ "$deb_version" > "13.1" ]]; then +sudo cp -rf ./usr/99-fbturbo-fbcp.conf /usr/share/X11/xorg.conf.d/99-fbturbo.~ +sudo cp -rf ./etc/.bash_profile /home/$username/ + +#sudo cp -rf ./etc/rc_x11.local /etc/rc.local +fi + +if [[ "$deb_version" < "13.1" ]]; then sudo cp -rf ./etc/rc.local /etc/rc.local #if test "$root_dev" = "/dev/mmcblk0p7";then #sudo cp ./usr/cmdline.txt-noobs /boot/cmdline.txt @@ -47,10 +56,12 @@ sudo cp -rf ./etc/rc.local /etc/rc.local sudo cp -rf ./etc/modules /etc/modules sudo chmod 644 /etc/modules sudo cp -rf ./etc/modprobe.d/fbtft.conf /etc/modprobe.d/ +fi sudo touch ./.have_installed echo "hdmi:resistance:mhs397:0:800:480" > ./.have_installed +if [[ "$deb_version" < "13.1" ]]; then if [[ "$deb_version" < "12.10" ]]; then sudo apt-get update fi @@ -95,6 +106,7 @@ fi else echo "bad network, can't install cmake!!!" fi +fi #evdev install #nodeplatform=`uname -n` @@ -103,8 +115,8 @@ version=`uname -v` #if test "$nodeplatform" = "raspberrypi";then #echo "this is raspberrypi kernel" input_result=0 -version=${version##* } -#version=${version#*#} +version=${version##*(} +version=${version%%-*} echo $version if test $version -lt 2017;then echo "reboot" diff --git a/MIS35-show b/MIS35-show index 856f680..2f7ca3a 100755 --- a/MIS35-show +++ b/MIS35-show @@ -37,16 +37,27 @@ sudo cp -rf ./usr/99-calibration.conf-mis35-90 /etc/X11/xorg.conf.d/99-calibrat if [[ "$deb_version" < "12.1" ]]; then sudo cp -rf ./usr/99-fbturbo.conf /usr/share/X11/xorg.conf.d/99-fbturbo.conf fi + +if [[ "$deb_version" = "13.1" ]] || [[ "$deb_version" > "13.1" ]]; then +sudo cp -rf ./usr/99-fbturbo-fbcp.conf /usr/share/X11/xorg.conf.d/99-fbturbo.~ +sudo cp -rf ./etc/.bash_profile /home/$username/ + +#sudo cp -rf ./etc/rc_x11.local /etc/rc.local +fi + #if test "$root_dev" = "/dev/mmcblk0p7";then #sudo cp ./usr/cmdline.txt-noobs /boot/cmdline.txt #else #sudo cp ./usr/cmdline.txt /boot/ #fi +if [[ "$deb_version" < "13.1" ]]; then sudo cp ./usr/inittab /etc/ +fi #sudo cp ./boot/config-mhs35.txt /boot/config.txt sudo touch ./.have_installed echo "gpio:resistance:mis35:90:480:320" > ./.have_installed +if [[ "$deb_version" < "13.1" ]]; then if [[ "$deb_version" < "12.10" ]]; then sudo apt-get update fi @@ -91,6 +102,7 @@ fi else echo "bad network, can't install cmake!!!" fi +fi #evdev install #nodeplatform=`uname -n` @@ -99,8 +111,8 @@ version=`uname -v` #if test "$nodeplatform" = "raspberrypi";then #echo "this is raspberrypi kernel" input_result=0 -version=${version##* } -#version=${version#*#} +version=${version##*(} +version=${version%%-*} echo $version if test $version -lt 2017;then echo "reboot"