Merge KenUNIX's changes from 'master' into dev

Conflicts:
	Makefile
	bwbasic.desktop
	bwbasic.png
	bwbasic.sh
	compile.bat

GUI/bwbasic.desktop

@@ -4,8 +4,9 @@ Encoding=UTF-8
 Name=Bywater BASIC
 GenericName=Bywater BASIC
 Type=Application
-Exec=<File Location Example /home/username/bin/>bwbasic.sh
-Icon=<File Location Example /home/username/png/>bwbasic.png
+Exec=/usr/local/bin/bwbasic.sh
+Icon=/usr/share/pixmaps/bwbasic.png
 StartupNotify=true
 Terminal=true
 Categories=Development
+

GUI/bwbasic.sh

@@ -1,11 +1,12 @@
 #!/bin/sh
 # 12/14/2019 Ken
 # 07/28/2020 enhanced by ChipMaster
+# 10/02/2021 fix typo kenunix
 [ -z "$BWBASIC" ]   && BWBASIC="$HOME/bwbasic"
 [ ! -d "$BWBASIC" ] && mkdir "$BWBASIC"
 cd "$BWBASIC"
-trap 'echo " "; echo "PROGRAM INTERRUPTED"; echo "Press Enter "; read j; exit 1' INT
+trap '/bin/echo " "; /bin/echo -e -n "PROGRAM INTERRUPTED. \007Press Enter "; read j; exit 1' INT
 bwbasic "$@"
 # -n = no newline -e interpret special octel numbers \007 = Bell
-/bin/echo -n -e "Bwbasic terminated. Press Enter \007"
+/bin/echo -n "Bwbasic terminated. Press Enter "
 read j

Makefile

@@ -1,7 +1,10 @@
 #
-# Makefile for bwbasic on Linux 8-9-2020
+# Makefile for bwbasic on Linux 10-02-2021 kenunix
 # Now version bwbasic-3.20d
 #
+# 10-02-2021 kenunix add addgui and delgui and corrected typos.
+#            set DEST to /usr/local/bin
+#
 # Tested on Ubuntu 18.04 Had to fix compatabily issues
 #           Ubuntu 20.04 Had to fix compatabily issues
 #           Debian 10 Buster
@@ -10,7 +13,7 @@
 #           Linux Mint LMDE4
 #           Linux Lite 4.8
 #
-#           ken.at.github@gmail.com
+#           ken.unix.guy@gmail.com
 #
 CC=gcc
 # If running on a Beaglebone you might want to replace
@@ -18,7 +21,7 @@ CC=gcc
 # to have a smaller runtime size
 CFLAGS=-s -ansi
 LIB=-lm
-DEST=/usr/bin
+DEST=/usr/local/bin
 # HOME=$HOME
 
 .PHONY: all
@@ -32,26 +35,23 @@ renum: renum.c
 	$(CC) $(CFLAGS) -o renum renum.c $(LIB) 
 	
 
-# bwbasic and renum runtime. editfl temp file created by renum
+# bwbasic and renum runtime. editfl.bas temp file created by renum
 clean:
-	rm *.o bwbasic renum editfl editfl.bas core || true
+	rm -f *.o bwbasic renum editfl.bas core
 
 install:
 	ls -l bwbasic renum
 	cp bwbasic renum GUI/bwbasic.sh $(DEST)/.
 	ls -l $(DEST)/bwbasic $(DEST)/renum $(DEST)/bwbasic.sh
 	mkdir -p /usr/share/bwbasic
-	mkdir -p /usr/share/doc/cbwbasic
+	mkdir -p /usr/share/doc/bwbasic
 	mkdir -p /usr/share/doc/bwbasic/docs
-	mkdir -p $HOME/Desktop
 	cp BAS-EXAMPLES/*     /usr/share/bwbasic/.
 	cp DOCS/*             /usr/share/doc/bwbasic/docs/.
 	cp README READMEFIRST /usr/share/doc/bwbasic/.
 	cp COPYING            /usr/share/doc/bwbasic/.
 	cp bwbasic.png        /usr/share/pixmaps/.
 	cp bwbasic.desktop    /usr/share/applications/bwbasic.desktop 
-	# cp bwbasic.desktop    $HOME/Desktop/.
-	# chmod 666             $HOME/Desktop/bwbasic/desktop
 
 remove:
 	rm $(DEST)/bwbasic $(DEST)/renum $(DEST)/bwbasic.sh
@@ -73,3 +73,12 @@ run:
 runlocal:
 	./bwbasic
 
+# Must do as user not root
+addgui:
+	cp bwbasic.desktop ${HOME}/Desktop/bwbasic.desktop
+	ls -l ${HOME}/Desktop/bwbasic.desktop
+
+# Must do as user not root
+delgui:
+	rm -f ${HOME}/Desktop/bwbasic.desktop
+

compile.bat

@@ -1,11 +1,13 @@
 @echo off
-echo 9-20-2021 Ken. bwbasic. Works under Windows 10 using gcc 7.4.0
-echo                              and gcc 8.1.0 64 bit
-echo            and Windows 11 using tdm64-gcc-5.1.0-2 gcc 5.1.0 32 and 64 bit
-echo https://sourceforge.net/projects/tdm-gcc/files/TDM-GCC%20Installer/tdm64-gcc-5.1.0-2.exe/download
-echo                           gcc 5.1.0 works with XP, 7 and 10
+echo 10-02-2021 Ken. bwbasic  compile.bat
+echo.
+echo                     Tested under Windows XP , 7 ,10 and 11
 echo                             added notes for 32 bit
 echo.
+echo Source - https://sourceforge.net/projects/tdm-gcc/files/TDM-GCC%20Installer/tdm64-gcc-5.1.0-2.exe/download
+echo.
+echo                           Tested under bwbasic-3.20d
+echo.
 echo                                      Wait
 echo.