diff --git a/README.md b/README.md index 79da7ea..46c7c55 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ NextionDriver Installer and Checker =================================== + +This is installer version 1.03 ( 09 feb 2019 ) + This repository brings you 3 helper programs for the installation of NextionDriver when you do not want to do it by hand: @@ -8,8 +11,6 @@ NextionDriver when you do not want to do it by hand: using NextionDriver (this is called by the installer program) * a program to check the installation -This is installer version 1.02 ( 03 feb 2019 ) - ----- __Please use this installer to update your system if your installation is older than this date. Even if the NextionDriver was recently updated__ diff --git a/check_installation.sh b/check_installation.sh index 1f87ff9..323d3d1 100755 --- a/check_installation.sh +++ b/check_installation.sh @@ -44,8 +44,8 @@ if [ "$CHECK" = "" ]; then fi echo "----------------------" -echo "Searchin MMDVMHost ..." -echo "----------------------" +echo "Searching MMDVMHost ..." +echo "-----------------------" if [ "$MMDVM" = "" ]; then MMDVM=$(find / -executable | grep "MMDVMHost$") AANT=$(echo "$MMDVM" | wc -l) @@ -59,7 +59,7 @@ else echo "+ MMDVMHost found at $MMDVM" fi -echo "+ Searchin MMDVMHost configuration file ..." +echo "+ Searching MMDVMHost configuration file ..." CONFIGOK="" if [ -f "$CONFIGFILE" ]; then CONFIGOK=$(cat $CONFIGFILE | grep General) @@ -121,8 +121,8 @@ fi echo "" echo "--------------------------" -echo "Searchin NextionDriver ..." -echo "--------------------------" +echo "Searching NextionDriver ..." +echo "---------------------------" if [ "$ND" = "" ]; then ND=$(find / -executable | grep "NextionDriver$") AANT=$(echo "$ND" | wc -l) diff --git a/install.sh b/install.sh index 4286bf7..9c2e5ed 100755 --- a/install.sh +++ b/install.sh @@ -5,7 +5,7 @@ # # # (c)2018-2019 by ON7LDS # # # -# V1.02 # +# V1.03 # # # ######################################################### @@ -36,6 +36,7 @@ MMDVM=$(which MMDVMHost) BINDIR=$(echo "$MMDVM" | sed "s/\/MMDVMHost//") CONFIGFILE="MMDVM.ini" CONFIGDIR="/etc/" +FILESDIR="/usr/local/etc/" SYSTEMCTL="systemctl daemon-reload" MMDVMSTOP="service mmdvmhost stop" MMDVMSTART="service mmdvmhost start" @@ -74,9 +75,11 @@ checkversion () { fi } helpfiles () { + rm -f /etc/groups.txt + rm -f /etc/stripped.csv echo "+ Copying groups and users files" - cp $DIR/groups.txt $CONFIGDIR - cp $DIR/stripped.csv $CONFIGDIR + cp $DIR/groups.txt $FILESDIR + cp $DIR/stripped.csv $FILESDIR } herstart () { echo -e "\n+ To test if it all works as expected," @@ -105,8 +108,7 @@ if [ "$PISTAR" = "OK" ]; then CHECK="PISTAR" fi if [ "$CHECK" = "" ]; then - -echo "Bindir [$BINDIR]" +# echo "Bindir [$BINDIR]" if [ "$BINDIR" = "/opt/MMDVMHost" ]; then echo "" echo "+ Found MMDVMHost in /opt." @@ -127,8 +129,6 @@ if [ "$CHECK" = "" ]; then echo "" exit fi - - if [ "$MMDVM" = "" ]; then echo "" echo "- No MMDVMHost found," @@ -200,7 +200,7 @@ fi VERSIE=$($ND -V | grep version | sed "s/^.*version //") V=$(echo $VERSIE | sed 's/\.//') echo "+ NextionDriver $VERSIE found at $ND" -echo "+ We are version $THISVERSION" +echo "+ We are at version $THISVERSION" if [ $TV -gt $V ]; then echo "+ Start Update" diff --git a/mmdvmhost.service.pistar b/mmdvmhost.service.pistar old mode 100755 new mode 100644 diff --git a/nextiondriver.service.binary.pistar b/nextiondriver.service.binary.pistar old mode 100755 new mode 100644