This commit is contained in:
T. Joseph Carter 2015-11-25 14:04:51 -08:00
commit c939de8c32
3 changed files with 309 additions and 98 deletions

203
changelog.txt Normal file
View File

@ -0,0 +1,203 @@
a2cloud (0.99beta) stable; urgency=low
* internet access and virtual drives for any Apple II via a Raspberry Pi;
introduced at KansasFest 2013
-- Ivan Drucker <ivan@ivanx.com> Sat, 27 Jul 2013 00:00:00 +0000
a2cloud (1.0) stable; urgency=low
* first proper release with full documentation, bug fixes, and demo video
-- Ivan Drucker <ivan@ivanx.com> Mon, 02 Sep 2013 00:00:00 +0000
a2cloud (1.2.3) stable; urgency=low
* A2PI client version 1.3 added to A2CLOUD disk
* faster install for unar/lsar, nulib2, and cftp (downloads rather than
compiles)
* console (built-in serial) login disabled, to allow Apple II Pi to have
that port
* installs xrdp/tightvncserver for remote desktop access from another
computer
* adds DSK2FILE image utility to A2CLOUD disk
* NB: Date is approximated in changelog format conversion (Joseph Carter)
-- Ivan Drucker <ivan@ivanx.com> Sat, 30 Nov 2013 00:00:00 +0000
a2cloud (1.5) stable; urgency=low
* Adds IRC and newsreader clients (Irssi and Tin) and, with shortcuts for
Apple II community ("a2chat" and "a2news" commands)
* adds KEGS and LinApple emulators
* installs Apple II Pi
* easy installation via Raspple II
-- Ivan Drucker <ivan@ivanx.com> Sun, 01 Dec 2013 00:00:00 +0000
a2cloud (1.5.2) stable; urgency=low
* added "dos2pro" command
* Apple II Pi is now installed with GSport emulator and “apple2user” packages
* speedier install by downloading A2CLOUD disk images instead of building them
-- Ivan Drucker <ivan@ivanx.com> Sun, 22 Dec 2013 00:00:00 +0000
a2cloud (1.6) stable; urgency=low
* ADTPro/VSDRIVE 1.2.9 (much faster virtual drives read performance, for the
price of a short delay on the "vsd1"/"vsd2" commands and a need to type
"vsdsync" after changing an active virtual drive directly on the Pi; ability
to run VSDRIVE from ProDOS program launcher, not just BASIC.SYSTEM)
* if A2SERVER is installed, shares the ADTPro disks folder as ADTDISKS on the
network
* responds to name “raspberrypi.local” as alternative to IP address to Mac OS
X (and Windows with Bonjour Print Services installed) computers on network
-- Ivan Drucker <ivan@ivanx.com> Tue, 31 Dec 2013 00:00:00 +0000
a2cloud (1.6.1) stable; urgency=low
* Added "telnet" and "ttytter" (Twitter client)
* fix for network boot failure when set up under v1.6
-- Ivan Drucker <ivan@ivanx.com> Tue, 14 Jan 2014 00:00:00 +0000
a2cloud (1.6.2) stable; urgency=low
* Improved display of non-ASCII characters in Apple II terminal emulation
programs
* Support for “PC ANSI” colored text and graphics characters , for use with
Spectrums ANSI online display, via new "term" command * Added "sciibin" and
"unblu" for converting BinSCII and Binary II files
* "baud" command supports 300 baud, in case you *really* want to kick it old
school
-- Ivan Drucker <ivan@ivanx.com> Sun, 19 Jan 2014 00:00:00 +0000
a2cloud (1.6.3) stable; urgency=low
* Set TTYtter to always use -ssl mode, which is required by Twitter after
14-Jan-14.
* Set TTYtter to avoid display of non-ASCII characters on serial port shell
* Set TTYtter to use color ANSI text (for IIgs) if shell is currently set to
display it
* Provided TTYtter readline module for enhanced input with -readline option
* Added "appleiipi-update" command
-- Ivan Drucker <ivan@ivanx.com> Wed, 23 Jan 2014 00:00:00 +0000
a2cloud (1.6.4) stable; urgency=low
* support for "screen" command to allow switching between multiple terminals
on Apple II
* "term -f" can be used to force emulation setting even when "term" doesnt
want to
-- Ivan Drucker <ivan@ivanx.com> Fri, 31 Jan 2014 00:00:00 +0000
a2cloud (1.6.5) stable; urgency=low
* can use "term mono" and "term color" instead of "term vt100" and "term
pcansi"
-- Ivan Drucker <ivan@ivanx.com> Wed, 05 Feb 2014 00:00:00 +0000
a2cloud (1.6.6) stable; urgency=low
* beta support for Debian and Ubuntu Linux on non-Pi machines
* ttytter support for color and avoiding non-ASCII characters when running
 under Screen
* opens LXTerminal window by default when starting graphical desktop
* a2cloud-setup installs Screen if not already installed
* a2cloud-setup shows installed and available versions
* a2cloud-setup -y bypasses all prompts
-- Ivan Drucker <ivan@ivanx.com> Sat, 17 Feb 2014 00:00:00 +0000
a2cloud (1.6.7) stable; urgency=low
* A2CLOUD boot floppy contains A2PI client version 1.4
* A2CLOUD boot floppy splash screen provides simple menu for virtual drives,
Apple II Pi, or BASIC
* A2CLOUD.HDV is now called A2CLOUD.PO (a symbolic link called A2CLOUD.HDV is
still there for backwards compatibility/habits)
* bug fixes for "cppo", "shk2image", and some launcher scripts""
-- Ivan Drucker <ivan@ivanx.com> Mon, 19 Nov 2014 00:00:00 +0000
a2cloud (1.6.8) stable; urgency=low
* ADTPro 1.3.0
* TTYtter installs properly on non-Pi systems
-- Ivan Drucker <ivan@ivanx.com> Mon, 07 Apr 2014 00:00:00 +0000
a2cloud (1.6.9) stable; urgency=low
* ADTPro 2.0.0 (quicker and more reliable transfer; selectable filenames from
list)
* confirmed working on Raspberry Pi Model B+ (use the USB ports closer to the
Ethernet port)
-- Ivan Drucker <ivan@ivanx.com> Thu, 24 Jul 2014 00:00:00 +0000
a2cloud (1.7.0) stable; urgency=low
* a2cloud-setup installs Java 8 if not already installed
-- Ivan Drucker <ivan@ivanx.com> Sat, 02 Aug 2014 00:00:00 +0000
a2cloud (1.7.1) stable; urgency=low
* A2CLOUD is no longer “beta” on non-Raspberry Pi computers
* A2CLOUD includes KEGS and Linapple on non-Raspberry Pi computers
* A2CLOUD has a faster install script for non-Raspberry Pi computers
(downloads binaries)
* unbit/unexec/bsq archive tools are installed
-- Ivan Drucker <ivan@ivanx.com> Mon, 11 Aug 2014 00:00:00 +0000
a2cloud (1.7.2) stable; urgency=low
* supports Raspberry Pi Model A and A+ (and Pi 2 Model B)
* resolves issues with Raspbian 2015-01-31 (kernel 3.18)
-- Ivan Drucker <ivan@ivanx.com> Sat, 07 Feb 2015 00:00:00 +0000
a2cloud (1.8.0) stable; urgency=low
* compatible with every Raspberry Pi, including Raspberry Pi 2 Model B
* GSport installed for non-Raspberry Pi computers, with option for
new GS/OS+Spectrum installation, or GSport Internet Starter Kit premade
image
* Links web browser
* desktop shortcuts and Apple II menu group for emulators and ADTPro
* new "a2cloud-update os" command will perform full Raspple II update,
including Raspbian OS and NOOBS install manager, A2CLOUD, A2SERVER, and
Apple II Pi
* many small improvements and fixes to A2CLOUD environment and installer
script
-- Ivan Drucker <ivan@ivanx.com> Tue, 17 Mar 2015 00:00:00 +0000
a2cloud (1.8.1) stable; urgency=low
* ADTPro 2.0.1
* Apple II Pi client 1.5
-- Ivan Drucker <ivan@ivanx.com> Tue, 05 May 2015 00:00:00 +0000
a2cloud (1.9.0) oldstable; urgency=low
* Does NOT support Raspbian jessie yet (thus the oldstable).
* First release from GitHub version
[ Joseph Carter ]
* Archived Ivan Drucker's A2CLOUD site in source tree
* As this package will be native package, convert its changelog to Debian
style. Developers may want to install the devscripts package and have a
look at the manpage for dch(1). Mac developers, if you use TextExpander,
I can share a snippet for RFC-2822 compliant dates.
-- Joseph Carter <tjcarter@spiritsubstance.com> Thu, 12 Nov 2015 21:50:48 -0800

View File

@ -139,4 +139,6 @@ $HEADLESS"$MY_JAVA_HOME"java -Xms256m -Xmx512m "$TWEAK" $ADTPRO_EXTRA_JAVA_PARMS
if [[ $1 == "serial" ]]; then
echo "Starting up on interface $serialPortName. Please wait..."
fi
sleep 30
if [ -t 0 ]; then
sleep 30
fi

View File

@ -1,7 +1,7 @@
#! /bin/bash
# vim: set tabstop=4 shiftwidth=4 expandtab filetype=sh:
version="182"
version="190"
adtProVersion="2.0.1"
# Ensure URL we'll use ends in a /
@ -202,7 +202,7 @@ else
installADTPro=
echo
echo -n "Install ADTPro server, for virtual drives and floppy disk transfers"
if [[ ! -f /usr/bin/X ]]; then
if ! command -v X >/dev/null; then
echo
echo -n "(the X Window System and LXDE desktop environment will be installed)"
fi
@ -392,7 +392,7 @@ source /usr/local/etc/a2cloudrc
echo "A2CLOUD: Saving installer version..."
echo "$version" | sudo tee /usr/local/etc/A2CLOUD-version &> /dev/null
if [[ ! $(dpkg -l avahi-daemon 2> /dev/null | grep ^ii) || ! $(dpkg -l libnss-mdns 2> /dev/null | grep ^ii) ]]; then
if ! dpkg-query -l avahi-daemon &>/dev/null || ! dpkg-query -l libnss-mdns &>/dev/null; then
echo "A2CLOUD: Installing avahi-daemon (mDNS)..."
sudo apt-get -y install avahi-daemon &> /dev/null
sudo apt-get -y clean
@ -420,7 +420,7 @@ if [[ $installADTPro ]]; then
[[ $0 == "-bash" ]] && return 3 || exit 3
fi
if [[ ! -f /usr/bin/X ]]; then
if ! command -v X >/dev/null; then
echo "A2CLOUD: Installing X Window System and LXDE..."
sudo apt-get -y install xorg lxde
sudo apt-get -y clean
@ -431,13 +431,6 @@ if [[ $installADTPro ]]; then
echo "A2CLOUD: X Window System and LXDE are already installed."
fi
# if [[ ! -f /etc/xdg/autostart/lxterminal.desktop ]]; then
# echo "A2CLOUD: Setting terminal window to auto-open on desktop..."
# echo -e "\n[Desktop Entry]\nType=Application\nExec=/usr/bin/lxterminal" | sudo tee /etc/xdg/autostart/lxterminal.desktop > /dev/null
# else
# echo "A2CLOUD: Terminal window already set to auto-open on desktop."
# fi
if { lspci 2> /dev/null | grep -q VirtualBox; }; then
if { ! grep -q default /etc/xdg/lxsession/LXDE/autostart; }; then
echo "A2CLOUD: Setting desktop to 800x600 in VirtualBox console (no Additions)..."
@ -573,8 +566,8 @@ if [[ $installADTPro ]]; then
[[ ! -f /usr/lib/RXTXcomm.jar ]] && sudo ln -s /usr/share/java/RXTXcomm.jar /usr/lib &> /dev/null
[[ ! -d /usr/local/adtpro/lib/rxtx/rxtx-2.2pre2-local/arm ]] && ln -s /usr/lib/jni /usr/local/adtpro/lib/rxtx/rxtx-2.2pre2-local/arm &> /dev/null
if [[ ! -f /usr/bin/xvfb-run ]]; then
echo "A2CLOUD: Installing xvfb for headless operation..."cd
if ! command -v xvfb-run >/dev/null; then
echo "A2CLOUD: Installing xvfb for headless operation..."
sudo apt-get -y install xvfb
sudo apt-get -y clean
else
@ -636,8 +629,8 @@ if [[ $installADTPro ]]; then
fi
if [[ -f /usr/bin/X ]]; then
if [[ ! -f /usr/sbin/xrdp ]]; then
if command -v X >/dev/null; then
if dpkg-query -l xrdp; then
echo "A2CLOUD: Installing xrdp/tightvncserver..."
sudo apt-get -y install xrdp
sudo apt-get -y clean
@ -645,7 +638,7 @@ if [[ -f /usr/bin/X ]]; then
echo "A2CLOUD: xrdp/tightvncserver is already installed."
fi
else
echo "A2CLOUD: /usr/bin/X not found; not installing xrdp/tightvncserver."
echo "A2CLOUD: X11 not found; not installing xrdp/tightvncserver."
fi
if [[ $setupSerialPortLogin ]]; then
@ -655,7 +648,7 @@ if [[ $setupSerialPortLogin ]]; then
sudo sed -i 's/^\(T.*\)ttyAMA0 .* /#\1ttyAMA0 4800 /' /etc/inittab
sudo sed -i 's/ttyAMA0,[0-9]*/ttyAMA0,4800/g' /boot/cmdline.txt 2> /dev/null
if [[ ! -f /usr/bin/screen ]]; then
if ! command -v screen >/dev/null; then
echo "A2CLOUD: Installing Screen for multiple terminals..."
sudo apt-get -y install screen
sudo apt-get -y clean
@ -756,7 +749,7 @@ fi
if [[ $installCommTools ]]; then
if [[ ! -f /usr/bin/curl ]]; then
if ! command -v curl >/dev/null; then
echo "A2CLOUD: Installing curl..."
sudo apt-get -y install curl
sudo apt-get -y clean
@ -764,7 +757,7 @@ if [[ $installCommTools ]]; then
echo "A2CLOUD: curl is already installed."
fi
if [[ ! -f /usr/bin/sz ]]; then
if ! command -v sz >/dev/null; then
echo "A2CLOUD: Installing rzsz for X/Y/Zmodem transfers..."
sudo apt-get -y install lrzsz
sudo apt-get -y clean
@ -772,7 +765,7 @@ if [[ $installCommTools ]]; then
echo "A2CLOUD: rzsz is already installed."
fi
if [[ ! -f /usr/bin/ftp ]]; then
if ! command -v ftp >/dev/null; then
echo "A2CLOUD: Installing ftp..."
sudo apt-get -y install ftp
sudo apt-get -y clean
@ -780,7 +773,7 @@ if [[ $installCommTools ]]; then
echo "A2CLOUD: ftp is already installed."
fi
if [[ ! -f /usr/local/bin/cftp ]]; then
if ! command -v cftp >/dev/null; then
echo "A2CLOUD: Installing cftp..."
cd /tmp/a2cloud-install
if [[ $downloadBinaries ]]; then
@ -790,7 +783,7 @@ if [[ $installCommTools ]]; then
wget -qO- http://appleii.ivanx.com/a2cloud/files/cftp-debian7_x86.tgz | sudo tar Pzx
fi
fi
if [[ ! -f /usr/local/bin/cftp ]]; then
if ! command -v cftp >/dev/null; then
sudo apt-get -y install build-essential
sudo apt-get -y install ncurses-dev
sudo apt-get -y clean
@ -810,7 +803,7 @@ if [[ $installCommTools ]]; then
echo "A2CLOUD: cftp is already installed."
fi
if [[ ! -f /usr/bin/lynx ]]; then
if ! command -v lynx >/dev/null; then
echo "A2CLOUD: Installing lynx..."
sudo apt-get -y install lynx
sudo apt-get -y clean
@ -818,7 +811,7 @@ if [[ $installCommTools ]]; then
echo "A2CLOUD: lynx is already installed."
fi
if [[ ! -f /usr/bin/links ]]; then
if ! command -v links >/dev/null; then
echo "A2CLOUD: Installing links..."
sudo apt-get -y --force-yes install links
sudo apt-get -y clean
@ -828,7 +821,7 @@ if [[ $installCommTools ]]; then
sudo wget -qO /usr/local/bin/a2news ${scriptURL}setup/a2news.txt
sudo chmod ugo+x /usr/local/bin/a2news
if [[ ! -f /usr/bin/tin ]]; then
if ! command -v tin >/dev/null; then
echo "A2CLOUD: Installing a2news/tin..."
sudo apt-get -y install tin
sudo apt-get -y clean
@ -853,7 +846,7 @@ if [[ $installCommTools ]]; then
sudo wget -qO /usr/local/bin/a2chat ${scriptURL}setup/a2chat.txt
sudo chmod ugo+x /usr/local/bin/a2chat
if [[ ! -f /usr/bin/irssi ]]; then
if ! command -v irssi >/dev/null; then
echo "A2CLOUD: Installing a2chat/irssi..."
sudo apt-get -y install irssi
sudo apt-get -y clean
@ -861,7 +854,7 @@ if [[ $installCommTools ]]; then
echo "A2CLOUD: a2chat/irssi is already installed."
fi
if [[ ! -f /usr/bin/telnet ]]; then
if ! command -v telnet >/dev/null; then
echo "A2CLOUD: Installing telnet..."
sudo apt-get -y install telnet
sudo apt-get -y clean
@ -869,7 +862,9 @@ if [[ $installCommTools ]]; then
echo "A2CLOUD: telnet is already installed."
fi
if [[ ( ! -f /usr/bin/ttytter && ! -f /usr/local/bin/ttytter ) || ! -f "/usr/local/share/perl/5.14.2/Term/ReadLine/TTYtter.pm" ]]; then
# Do we need to check for the readline module here as well?
#if [[ ( ! -f /usr/bin/ttytter && ! -f /usr/local/bin/ttytter ) || ! -f "/usr/local/share/perl/5.14.2/Term/ReadLine/TTYtter.pm" ]]; then
if ! command -v ttyter >/dev/null; then
echo "A2CLOUD: Installing TTYtter..."
sudo wget -qO /usr/local/bin/ttytter http://www.floodgap.com/software/ttytter/dist2/2.1.00.txt
sudo chmod ugo+x /usr/local/bin/ttytter
@ -914,7 +909,7 @@ if [[ $installCommTools ]]; then
fi
if [[ $installA2Pi ]]; then
if [[ ! -f /sbin/a2pid ]]; then
if dpkg-query -l a2pi &>/dev/null; then
echo "A2CLOUD: Installing Apple II Pi..."
cd /tmp/a2cloud-install
if ! grep 'schmenk.is-a-geek.com' /etc/apt/sources.list; then
@ -931,7 +926,7 @@ if [[ $installA2Pi ]]; then
sudo apt-get -y install libpcap0.8-dev
sudo apt-get -y clean
fi
if [[ ! -f /usr/bin/gsport ]]; then
if ! command -v gsport >/dev/null; then
# echo "A2CLOUD: Updating package repositories to include Apple II Pi..."
# sudo apt-get -y update > /dev/null
echo "A2CLOUD: Installing Apple II Pi extras (GSport)..."
@ -978,7 +973,7 @@ fi
if [[ $installEmulators ]]; then
# KEGS
if [[ ! -f /usr/local/bin/xkegs ]]; then
if ! command -v xkegs >/dev/null; then
echo "A2CLOUD: Installing KEGS..."
cd /tmp/a2cloud-install
if [[ $downloadBinaries ]]; then
@ -988,7 +983,7 @@ if [[ $installEmulators ]]; then
wget -qO- http://appleii.ivanx.com/a2cloud/files/kegs-debian7_x86.tgz | sudo tar Pzx
fi
fi
if [[ ! -f /usr/local/bin/xkegs ]]; then
if ! command -v xkegs >/dev/null; then
echo "A2CLOUD: Building KEGS from source..."
sudo apt-get -y install build-essential &> /dev/null
sudo apt-get -y install libx11-dev libxext-dev xfonts-base &> /dev/null
@ -1047,7 +1042,7 @@ if [[ $installEmulators ]]; then
wget -qO- http://appleii.ivanx.com/a2cloud/files/gsport-debian7_x86.tgz | sudo tar Pzx 2> /dev/null
fi
fi
if [[ ! -f /usr/local/bin/gsport ]]; then
if ! command -v gsport >/dev/null; then
echo "A2CLOUD: Building GSport from source..."
sudo apt-get -y install build-essential &> /dev/null
sudo apt-get -y install libx11-dev libxext-dev xfonts-base libpcap0.8-dev &> /dev/null
@ -1125,7 +1120,7 @@ if [[ $installEmulators ]]; then
# LinApple
if [[ ! -f /usr/local/linapple/linapple ]]; then
if ! command -v linapple >/dev/null; then
echo "A2CLOUD: Installing LinApple..."
cd /tmp/a2cloud-install
if [[ $downloadBinaries ]]; then
@ -1135,7 +1130,7 @@ if [[ $installEmulators ]]; then
wget -qO- http://appleii.ivanx.com/a2cloud/files/linapple-debian7_x86.tgz | sudo tar Pzx
fi
fi
if [[ ! -f /usr/local/linapple/linapple ]]; then
if ! command -v linapple >/dev/null; then
sudo apt-get -y install build-essential
sudo apt-get -y install libsdl1.2-dev libcurl4-openssl-dev zlib1g-dev libzip-dev
sudo apt-get -y clean
@ -1168,8 +1163,9 @@ fi
if [[ $installArchiveTools ]]; then
if [[ ! -f /usr/local/bin/nulib2 || ! -f /usr/local/bin/sciibin || ! -f /usr/local/bin/usq ]]; then
if ! command -v nulib2 >/dev/null; then
echo "A2CLOUD: Installing nulib2, sciibin, unblu, unbit, unexec, usq..."
echo "A2CLOUD: Installing nulib2..."
cd /tmp/a2cloud-install
if [[ $downloadBinaries ]]; then
@ -1179,7 +1175,7 @@ if [[ $installArchiveTools ]]; then
wget -qO- http://appleii.ivanx.com/a2cloud/files/nulib2-debian7_x86.tgz | sudo tar Pzx
fi
fi
if [[ ! -f /usr/local/bin/nulib2 ]]; then
if ! command -v nulib2 >/dev/null; then
sudo apt-get -y install build-essential
sudo apt-get -y install zlib1g-dev
sudo apt-get -y clean
@ -1201,23 +1197,27 @@ if [[ $installArchiveTools ]]; then
cd /tmp/a2cloud-install
rm -rf nulib
fi
if [[ ! -f /usr/local/bin/sciibin || ! -f /usr/local/bin/usq ]]; then
# install sciibin/unblu/unbit/unexec/usq
sudo apt-get -y install build-essential
sudo apt-get -y clean
rm -rf undoit &> /dev/null
mkdir -p undoit
cd undoit
wget -q http://web.archive.org/web/20110619163030/http://fadden.com/dl-apple2/undoit.zip
unzip undoit.zip
make
sudo mv sciibin unbit unblu unexec usq /usr/local/bin
cd /tmp/a2cloud-install
rm -rf undoit
fi
else
echo "A2CLOUD: nulib2, sciibin, unblu, unbit, unexec, usq are already installed."
echo "A2CLOUD: nulib2 is already installed."
fi
if ! command -v sciibin >/dev/null; then
echo "A2CLOUD: Installing sciibin, unblu, unbit, unexec, usq..."
sudo apt-get -y install build-essential
sudo apt-get -y clean
rm -rf undoit &> /dev/null
mkdir -p undoit
cd undoit
wget -q http://web.archive.org/web/20110619163030/http://fadden.com/dl-apple2/undoit.zip
unzip undoit.zip
make
sudo mv sciibin unbit unblu unexec usq /usr/local/bin
cd /tmp/a2cloud-install
rm -rf undoit
else
echo "A2CLOUD: sciibin, unblu, unbit, unexec, usq are already installed."
fi
echo "A2CLOUD: Setting up shk2image command..."
@ -1226,47 +1226,51 @@ if [[ $installArchiveTools ]]; then
# download and install The Unarchiver, for expanding apple.com disk images
# http://wakaba.c3.cx/s/apps/unarchiver.html
if [[ ! -f /usr/local/bin/unar ]]; then
if ! command -v unar >/dev/null; then
echo "A2CLOUD: Installing The Unarchiver..."
cd /tmp/a2cloud-install
if [[ $downloadBinaries ]]; then
if [[ $isRpi || $isDebian ]]; then
sudo apt-get -y install libgnustep-base1.22
sudo apt-get -y clean
if [[ $isRpi ]]; then
wget -qO- http://appleii.ivanx.com/a2cloud/files/unar-rpi.tgz | sudo tar Pzx
elif [[ $isDebian ]]; then
wget -qO- http://appleii.ivanx.com/a2cloud/files/unar-debian7_x86.tgz | sudo tar Pzx
if apt-cache show unar &>/dev/null; then
sudo apt-get -y install unar
else
cd /tmp/a2cloud-install
if [[ $downloadBinaries ]]; then
if [[ $isRpi || $isDebian ]]; then
sudo apt-get -y install libgnustep-base1.22
sudo apt-get -y clean
if [[ $isRpi ]]; then
wget -qO- http://appleii.ivanx.com/a2cloud/files/unar-rpi.tgz | sudo tar Pzx
elif [[ $isDebian ]]; then
wget -qO- http://appleii.ivanx.com/a2cloud/files/unar-debian7_x86.tgz | sudo tar Pzx
fi
fi
fi
if ! command -v unar >/dev/null; then
sudo apt-get -y install build-essential
sudo apt-get -y install libgnustep-base-dev libz-dev libbz2-dev
sudo apt-get -y install libssl-dev libicu-dev unzip
sudo apt-get -y clean
rm -rf unar &> /dev/null
mkdir -p unar
cd unar
wget -q -nc http://theunarchiver.googlecode.com/files/unar1.7_src.zip
unzip -o unar1.7_src.zip
cd The\ Unarchiver/XADMaster
make -f Makefile.linux
sudo mv lsar unar /usr/local/bin
cd ../Extra
sudo mkdir -p /usr/local/man/man1
sudo mv lsar.1 unar.1 /usr/local/man/man1
cd /tmp/a2cloud-install
rm -rf unar
fi
sudo mandb &> /dev/null
fi
if [[ ! -f /usr/local/bin/unar ]]; then
sudo apt-get -y install build-essential
sudo apt-get -y install libgnustep-base-dev libz-dev libbz2-dev
sudo apt-get -y install libssl-dev libicu-dev unzip
sudo apt-get -y clean
rm -rf unar &> /dev/null
mkdir -p unar
cd unar
wget -q -nc http://theunarchiver.googlecode.com/files/unar1.7_src.zip
unzip -o unar1.7_src.zip
cd The\ Unarchiver/XADMaster
make -f Makefile.linux
sudo mv lsar unar /usr/local/bin
cd ../Extra
sudo mkdir -p /usr/local/man/man1
sudo mv lsar.1 unar.1 /usr/local/man/man1
cd /tmp/a2cloud-install
rm -rf unar
fi
sudo mandb &> /dev/null
else
echo "A2CLOUD: The Unarchiver is already installed."
fi
fi
# add shortcuts to LXDE desktop and menu
if [[ -f /usr/bin/X ]]; then
if command -v X >/dev/null; then
[[ -d /etc/xdg/lxsession/LXDE-pi ]] && lxde="lxde-pi" || lxde="lxde"
echo "A2CLOUD: Creating LXDE desktop and menu shortcuts..."
@ -1291,29 +1295,31 @@ if [[ -f /usr/bin/X ]]; then
# create user desktop items folder
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
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
GSPORT_PATH="$(command -v gsport)"
if [ "$GSPORT_PATH" != "" ]; then
echo -e "[Desktop Entry]\nName=GSport\nComment=Apple IIgs Emulator\nExec=lxterminal -e $GSPORT_PATH\nIcon=/usr/local/share/gsport32.ico\nTerminal=false\nType=Application\nCategories=AppleII\n" | sudo tee /usr/local/share/applications/gsport.desktop > ~/Desktop/gsport.desktop
fi
if [[ ! -f /usr/local/share/gsport32.ico ]]; then
sudo wget -qO /usr/local/share/gsport32.ico http://appleii.ivanx.com/a2cloud/files/gsport32.ico
fi
# KEGS:
if [[ -f /usr/local/bin/kegs ]]; then
echo -e "[Desktop Entry]\nName=KEGS\nComment=Apple IIgs Emulator\nExec=lxterminal -e /usr/local/bin/kegs\nIcon=/usr/local/share/kegsicon.png\nTerminal=false\nType=Application\nCategories=AppleII\n" | sudo tee /usr/local/share/applications/kegs.desktop > /dev/null
KEGS_PATH="$(command -v kegs)"
if [ "KEGS_PATH" != "" ]; then
echo -e "[Desktop Entry]\nName=KEGS\nComment=Apple IIgs Emulator\nExec=lxterminal -e $KEGS_PATH\nIcon=/usr/local/share/kegsicon.png\nTerminal=false\nType=Application\nCategories=AppleII\n" | sudo tee /usr/local/share/applications/kegs.desktop > /dev/null
[[ ! -f ~/Desktop/gsport.desktop ]] && cp /usr/local/share/applications/kegs.desktop ~/Desktop/kegs.desktop
fi
if [[ ! -f /usr/local/share/kegsicon.png ]]; then
sudo wget -qO /usr/local/share/kegsicon.png http://appleii.ivanx.com/a2cloud/files/kegsicon.png
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
LINAPPLE_PATH="$(command -v linapple)"
if [ "LINAPPLE_PATH" != "" ]; then
echo -e "[Desktop Entry]\nName=LinApple\nComment=Apple IIe Emulator\nExec=lxterminal -e $LINAPPLE_PATH\nIcon=/usr/local/linapple/icon.bmp\nTerminal=false\nType=Application\nCategories=AppleII\n" | sudo tee /usr/local/share/applications/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
ADTPRO_PATH="$(command -v adtpro.sh)"
if [ "ADTPRO_PATH" != "" ]; then
echo -e "[Desktop Entry]\nName=ADTPro Server\nComment=Floppy Transfer Utility\nExec=$ADTPRO_PATH\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
fi
# LXTerminal:
if [[ ! $(grep lxterminal.desktop /etc/xdg/lxpanel/profile/LXDE-pi/panels/panel 2> /dev/null) && ! -f ~/Desktop/lxterminal.desktop ]]; then
@ -1428,7 +1434,7 @@ if [[ $a2CloudDisk ]]; then
sysutilsBackupURL="http://archive.org/download/download.info.apple.com.2012.11/download.info.apple.com.2012.11.zip/download.info.apple.com%2FApple_Support_Area%2FApple_Software_Updates%2FEnglish-North_American%2FApple_II%2FApple_II_Supplemental%2F"
# Apple System Utilities 3.1 support files
if [[ -f /usr/local/bin/unar ]]; then
if command -v unar >/dev/null; then
echo "A2CLOUD: Downloading and copying System Utilities support files..."
cd /tmp/a2cloud-install
wget --max-redirect 0 -qO Apple_II_System_Disk_3.2.sea.bin ${sysutilsURL}Apple_II_System_Disk_3.2.sea.bin
@ -1498,7 +1504,7 @@ if [[ $a2CloudDisk ]]; then
nulib2 -p dsk2file.shk dsk2file58 | acmd -p "$a2CloudDisk" DSK2FILE SYS
# Apple System Utilities 3.1 launch file
if [[ -f /usr/local/bin/unar ]]; then
if command -v unar >/dev/null; then
echo "A2CLOUD: Copying System Utilities launch file..."
acmd -g A2SYSDISK32.PO SYSUTIL.SYSTEM - | acmd -p "$a2CloudDisk" SYSUTIL SYS
else
@ -1641,7 +1647,7 @@ cd "$origDir"
rm setup &> /dev/null
rm a2cloud-setup &> /dev/null
rm -rf /tmp/a2cloud-install &> /dev/null
if [[ -f /usr/local/bin/gsport || -f /usr/bin/gsport || -f /usr/local/bin/kegs ]]; then
if command -v gsport >/dev/null || command -v kegs >/dev/null; then
sudo addgroup gsport &> /dev/null
sudo addgroup kegs &> /dev/null
sudo usermod -a -G audio,video,netdev,fuse,gsport,plugdev,kegs $USER &> /dev/null