From 40b55a599e37aa4dc002777cece77e5132d73115 Mon Sep 17 00:00:00 2001
From: Ivan X <ivan@ivanx.com>
Date: Sat, 23 Jul 2016 06:59:22 -0500
Subject: [PATCH] fix motd, and icon creation error messages in setup

---
 setup/motd.txt  | 17 ++++++++++++++++-
 setup/setup.txt |  8 ++++----
 2 files changed, 20 insertions(+), 5 deletions(-)
 mode change 120000 => 100644 setup/motd.txt

diff --git a/setup/motd.txt b/setup/motd.txt
deleted file mode 120000
index 1385dc6..0000000
--- a/setup/motd.txt
+++ /dev/null
@@ -1 +0,0 @@
-motd-rpi.txt
\ No newline at end of file
diff --git a/setup/motd.txt b/setup/motd.txt
new file mode 100644
index 0000000..ec09079
--- /dev/null
+++ b/setup/motd.txt
@@ -0,0 +1,16 @@
+
+Welcome to A2CLOUD!
+Instructions and help: http://appleii.ivanx.com
+
+Type 'a2cloud-help' for a list of A2CLOUD commands.
+Type 'system-shutdown' to turn off your Raspberry Pi.
+
+Type 'raspi-config' to configure your Raspberry Pi.
+Type 'startx' to start the Raspbian desktop.
+
+Type 'lynx' or 'links' to browse the web and 'cftp' to log into FTP sites.
+Type 'a2chat' or 'a2news' to talk about Apple II stuff with others.
+Type 'ttytter' to tweet. Type 'term color' for a color terminal on a IIgs.
+
+Type 'gsport' or 'kegs' to use the GSport or KEGS Apple IIgs emulators.
+Type 'linapple' to use the LinApple Apple IIe emulator.
diff --git a/setup/setup.txt b/setup/setup.txt
index f216ab8..1177fff 100755
--- a/setup/setup.txt
+++ b/setup/setup.txt
@@ -1282,20 +1282,20 @@ if [[ -f /usr/bin/X ]]; then
     mkdir -p ~/Desktop
     # GSport:
     if [[ -f /usr/bin/gsport ]]; then
-        echo -e "[Desktop Entry]\nName=GSport\nComment=Apple IIgs Emulator\nExec=lxterminal -e /usr/bin/gsport\nIcon=/usr/local/share/gsport32.ico\nTerminal=false\nType=Application\nCategories=AppleII\n" | sudo tee /usr/local/share/applications/gsport.desktop > ~/Desktop/gsport.desktop
+        echo -e "[Desktop Entry]\nName=GSport\nComment=Apple IIgs Emulator\nExec=lxterminal -e /usr/bin/gsport\nIcon=/usr/local/share/gsport32.ico\nTerminal=false\nType=Application\nCategories=AppleII\n" | sudo tee /usr/share/raspi-ui-overrides/gsport.desktop > ~/Desktop/gsport.desktop
     elif [[ -f /usr/local/bin/gsport ]]; then
-        echo -e "[Desktop Entry]\nName=GSport\nComment=Apple IIgs Emulator\nExec=lxterminal -e /usr/local/bin/gsport\nIcon=/usr/local/share/gsport32.ico\nTerminal=false\nType=Application\nCategories=AppleII\n" | sudo tee /usr/local/share/applications/gsport.desktop > ~/Desktop/gsport.desktop
+        echo -e "[Desktop Entry]\nName=GSport\nComment=Apple IIgs Emulator\nExec=lxterminal -e /usr/local/bin/gsport\nIcon=/usr/local/share/gsport32.ico\nTerminal=false\nType=Application\nCategories=AppleII\n" | sudo tee /usr/share/raspi-ui-overrides/gsport.desktop > ~/Desktop/gsport.desktop
     fi
     if [[ ! -f /usr/local/share/gsport32.ico ]]; then
         sudo wget -qO /usr/local/share/gsport32.ico ${binaryURL}gsport32.ico
     fi        
     # LinApple:
     if [[ -f /usr/local/bin/linapple ]]; then
-        echo -e "[Desktop Entry]\nName=LinApple\nComment=Apple IIe Emulator\nExec=lxterminal -e /usr/local/bin/linapple\nIcon=/usr/local/linapple/icon.bmp\nTerminal=false\nType=Application\nCategories=AppleII\n" | sudo tee /usr/local/share/applications/linapple.desktop > ~/Desktop/linapple.desktop
+        echo -e "[Desktop Entry]\nName=LinApple\nComment=Apple IIe Emulator\nExec=lxterminal -e /usr/local/bin/linapple\nIcon=/usr/local/linapple/icon.bmp\nTerminal=false\nType=Application\nCategories=AppleII\n" | sudo tee /usr/share/raspi-ui-overrides/linapple.desktop > ~/Desktop/linapple.desktop
     fi
     # ADTPro Server:
     if [[ -f /usr/local/bin/adtpro.sh ]]; then
-        echo -e "[Desktop Entry]\nName=ADTPro Server\nComment=Floppy Transfer Utility\nExec=/usr/local/bin/adtpro.sh\nIcon=/usr/local/adtpro/lib/ADTPro.ico\nTerminal=false\nType=Application\nCategories=AppleII\n" | sudo tee /usr/local/share/applications/adtproserver.desktop > ~/Desktop/adtproserver.desktop
+        echo -e "[Desktop Entry]\nName=ADTPro Server\nComment=Floppy Transfer Utility\nExec=/usr/local/bin/adtpro.sh\nIcon=/usr/local/adtpro/lib/ADTPro.ico\nTerminal=false\nType=Application\nCategories=AppleII\n" | sudo tee /usr/share/raspi-ui-overrides/adtproserver.desktop > ~/Desktop/adtproserver.desktop
     fi
     # LXTerminal:
     if [[ ! $(grep lxterminal.desktop /etc/xdg/lxpanel/profile/LXDE-pi/panels/panel 2> /dev/null) && ! -f ~/Desktop/lxterminal.desktop ]]; then