mirror of
https://github.com/RasppleII/a2cloud.git
synced 2024-12-22 13:30:27 +00:00
setup.txt: Remove (comment) A2Pi :(
There are a number of issues regarding A2Pi at the moment: 1. The default A2Pi config or anything resembling it does not presently work on Raspberry Pi 3 model B at all due to an upstream bug. 2. The default A2Pi config may not make sense anymore because it was really tailored for the Apple II Pi card. This is a cool device that looks like a modified Super Serial Card, but connects your Pi as an interal part of your Apple //! Of course, you can't currently get one, it wouldn't be able to power Pi 2/3, etc. 3. Parts of A2Pi like the apple2 user are not updated for Raspbian jessie at this time 4. We initially planned one more wheezy release, with me working on jessie stuff in the background that was more major and structural in nature. I sort of planned to spin A2Pi out of A2CLOUD during that rework and promoting it to its own thing within RasppleII's ecosystem. That way delays in development of either project would not hold things back for the other, and because cutting A2CLOUD down to size a bit would really make A2CLOUD easier to develop too. The combination of needing a new release, the sudden dropping of wheezy support, and the pile of new Pi releases is kinda hurting us a little. We have a definite regression for A2Pi any way we look at it because of the Pi3 bug. :( And we need to move to Jessie now. If you're using A2Pi now, this change shouldn't affect you. A2Pi is updated through Debian package mechanisms at the moment, so removing the initial setup from A2CLOUD shouldn't affect existing users on wheezy, even if they run the next release of the A2CLOUD installer script. If you don't have it, this version won't install it for you. Hopefully we can get back to it soon--I actually use it, so for me it's a missing feature! :)
This commit is contained in:
T. Joseph Carter
parent
9eeb44b7c9
commit
6228e52b06
165
setup/setup.txt
165
setup/setup.txt
@ -55,7 +55,9 @@ fi
|
||||
|
||||
buildA2CloudDisk=
|
||||
downloadBinaries=1
|
||||
noA2PiExtras=
|
||||
#= APPLE2PI BEGIN
|
||||
#noA2PiExtras=
|
||||
#= APPLE2PI END
|
||||
skipRepoUpdate=
|
||||
restartPrompt=
|
||||
autoAnswerYes=
|
||||
@ -69,9 +71,11 @@ while [[ $1 ]]; do
|
||||
elif [[ $1 == "-c" ]]; then
|
||||
shift
|
||||
downloadBinaries=
|
||||
elif [[ $1 == "-p" ]]; then
|
||||
shift
|
||||
noA2PiExtras=1
|
||||
#= APPLE2PI BEGIN
|
||||
# elif [[ $1 == "-p" ]]; then
|
||||
# shift
|
||||
# noA2PiExtras=1
|
||||
#= APPLE2PI END
|
||||
elif [[ $1 == "-r" ]]; then
|
||||
shift
|
||||
skipRepoUpdate="-r"
|
||||
@ -107,7 +111,9 @@ while [[ $1 ]]; do
|
||||
echo "-b: build A2CLOUD disks, rather than downloading premade images"
|
||||
echo "-c: compile non-package items, rather than downloading binaries"
|
||||
if [[ $isRpi ]]; then
|
||||
echo "-p: don't install Apple II Pi extras"
|
||||
#= APPLE2PI BEGIN
|
||||
# echo "-p: don't install Apple II Pi extras"
|
||||
#= APPLE2PI END
|
||||
echo "-os: update Raspbian OS, A2CLOUD, A2SERVER, and Apple II Pi"
|
||||
fi
|
||||
[[ $0 == "-bash" ]] && return 1 || exit 1
|
||||
@ -160,7 +166,9 @@ if [[ $installAllFeatures ]]; then
|
||||
installCommTools=1
|
||||
installArchiveTools=1
|
||||
installEmulators=1
|
||||
[[ $isRpi ]] && installA2Pi=1 || installA2Pi=
|
||||
#= APPLE2PI BEGIN
|
||||
# [[ $isRpi ]] && installA2Pi=1 || installA2Pi=
|
||||
#= APPLE2PI END
|
||||
else
|
||||
installADTPro=
|
||||
echo
|
||||
@ -247,13 +255,15 @@ else
|
||||
read
|
||||
[[ ${REPLY:0:1} == "Y" || ${REPLY:0:1} == "y" ]] && installEmulators=1
|
||||
|
||||
installA2Pi=
|
||||
if [[ $isRpi ]]; then
|
||||
echo
|
||||
echo -n "Install Apple II Pi? "
|
||||
read
|
||||
[[ ${REPLY:0:1} == "Y" || ${REPLY:0:1} == "y" ]] && installA2Pi=1
|
||||
fi
|
||||
#= APPLE2PI BEGIN
|
||||
# installA2Pi=
|
||||
# if [[ $isRpi ]]; then
|
||||
# echo
|
||||
# echo -n "Install Apple II Pi? "
|
||||
# read
|
||||
# [[ ${REPLY:0:1} == "Y" || ${REPLY:0:1} == "y" ]] && installA2Pi=1
|
||||
# fi
|
||||
#= APPLE2PI END
|
||||
fi
|
||||
|
||||
echo
|
||||
@ -871,67 +881,69 @@ if [[ $installCommTools ]]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ $installA2Pi ]]; 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
|
||||
echo "deb http://schmenk.is-a-geek.com/raspbian wheezy contrib" | sudo tee -a /etc/apt/sources.list > /dev/null
|
||||
sudo apt-get -y update > /dev/null
|
||||
fi
|
||||
sudo apt-get -y --force-yes install a2pi
|
||||
sudo apt-get -y clean
|
||||
else
|
||||
echo "A2CLOUD: Apple II Pi is already installed."
|
||||
fi
|
||||
if [[ ! $noA2PiExtras ]]; then
|
||||
if [[ ! $(dpkg -l | grep libpcap0.8-dev) ]]; then
|
||||
sudo apt-get -y install libpcap0.8-dev
|
||||
sudo apt-get -y clean
|
||||
fi
|
||||
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)..."
|
||||
sudo apt-get -y --force-yes install apple2user
|
||||
sudo apt-get -y clean
|
||||
else
|
||||
echo "A2CLOUD: Apple II Pi extras (GSport) are already installed."
|
||||
fi
|
||||
fi
|
||||
sudo sed -i 's/( $SSH_CLIENT || $REMOTEHOST )/( $(tty | grep ttyUSB) || $(tty | grep ttyAMA) || $SSH_CLIENT || $REMOTEHOST )/' /usr/bin/gsport
|
||||
if [[ $slot6 ]]; then
|
||||
echo "A2CLOUD: Putting blank disks in GSport slot 6..."
|
||||
sudo sed -i 's@^s6d1.*$@s6d1 = /usr/share/gsport/disks/slot6drive1.po@' /usr/share/gsport/config.txt
|
||||
sudo sed -i 's@^s6d2.*$@s6d2 = /usr/share/gsport/disks/slot6drive2.po@' /usr/share/gsport/config.txt
|
||||
sudo sed -i 's@^s6d1.*$@s6d1 = /usr/share/gsport/disks/slot6drive1.po@' /home/apple2/config.txt
|
||||
sudo sed -i 's@^s6d2.*$@s6d2 = /usr/share/gsport/disks/slot6drive2.po@' /home/apple2/config.txt
|
||||
if [[ ! -f /usr/share/gsport/disks/slot6drive1.po || ! -f /usr/share/gsport/disks/slot6drive2.po ]]; then
|
||||
wget -qO- ivanx.com/a2cloud/files/slot6-gsport-rpi.tgz | sudo tar Pzx 2> /dev/null
|
||||
fi
|
||||
fi
|
||||
|
||||
# set AppleTalk to turbo
|
||||
if ! grep -q 'g_appletalk_turbo' /usr/share/gsport/config.txt; then
|
||||
if grep -q 'bram1[00]' /usr/share/gsport/config.txt; then
|
||||
sudo sed -i 's/^\(bram1\[00\]\)/g_appletalk_turbo = 1\n\n\1/' /usr/share/gsport/config.txt
|
||||
else
|
||||
echo -e '\ng_appletalk_turbo = 1' | sudo tee -a /usr/share/gsport/config.txt > /dev/null
|
||||
fi
|
||||
fi
|
||||
sudo sed -i 's/^g_appletalk_turbo = 0/g_appletalk_turbo = 1/' /usr/share/gsport/config.txt
|
||||
|
||||
# enable Uthernet
|
||||
if ! grep -q 'g_ethernet[^_]' /usr/share/gsport/config.txt; then
|
||||
if grep -q 'bram1[00]' /usr/share/gsport/config.txt; then
|
||||
sudo sed -i 's/^\(bram1\[00\]\)/g_ethernet = 1\n\n\1/' /usr/share/gsport/config.txt
|
||||
else
|
||||
echo -e '\ng_ethernet = 1' | sudo tee -a /usr/share/gsport/config.txt > /dev/null
|
||||
fi
|
||||
fi
|
||||
sudo sed -i 's/^g_ethernet = 0/g_ethernet = 1/' /usr/share/gsport/config.txt
|
||||
|
||||
fi
|
||||
#= APPLE2PI BEGIN
|
||||
#if [[ $installA2Pi ]]; 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
|
||||
# echo "deb http://schmenk.is-a-geek.com/raspbian wheezy contrib" | sudo tee -a /etc/apt/sources.list > /dev/null
|
||||
# sudo apt-get -y update > /dev/null
|
||||
# fi
|
||||
# sudo apt-get -y --force-yes install a2pi
|
||||
# sudo apt-get -y clean
|
||||
# else
|
||||
# echo "A2CLOUD: Apple II Pi is already installed."
|
||||
# fi
|
||||
# if [[ ! $noA2PiExtras ]]; then
|
||||
# if [[ ! $(dpkg -l | grep libpcap0.8-dev) ]]; then
|
||||
# sudo apt-get -y install libpcap0.8-dev
|
||||
# sudo apt-get -y clean
|
||||
# fi
|
||||
# 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)..."
|
||||
# sudo apt-get -y --force-yes install apple2user
|
||||
# sudo apt-get -y clean
|
||||
# else
|
||||
# echo "A2CLOUD: Apple II Pi extras (GSport) are already installed."
|
||||
# fi
|
||||
# fi
|
||||
# sudo sed -i 's/( $SSH_CLIENT || $REMOTEHOST )/( $(tty | grep ttyUSB) || $(tty | grep ttyAMA) || $SSH_CLIENT || $REMOTEHOST )/' /usr/bin/gsport
|
||||
# if [[ $slot6 ]]; then
|
||||
# echo "A2CLOUD: Putting blank disks in GSport slot 6..."
|
||||
# sudo sed -i 's@^s6d1.*$@s6d1 = /usr/share/gsport/disks/slot6drive1.po@' /usr/share/gsport/config.txt
|
||||
# sudo sed -i 's@^s6d2.*$@s6d2 = /usr/share/gsport/disks/slot6drive2.po@' /usr/share/gsport/config.txt
|
||||
# sudo sed -i 's@^s6d1.*$@s6d1 = /usr/share/gsport/disks/slot6drive1.po@' /home/apple2/config.txt
|
||||
# sudo sed -i 's@^s6d2.*$@s6d2 = /usr/share/gsport/disks/slot6drive2.po@' /home/apple2/config.txt
|
||||
# if [[ ! -f /usr/share/gsport/disks/slot6drive1.po || ! -f /usr/share/gsport/disks/slot6drive2.po ]]; then
|
||||
# wget -qO- ivanx.com/a2cloud/files/slot6-gsport-rpi.tgz | sudo tar Pzx 2> /dev/null
|
||||
# fi
|
||||
# fi
|
||||
#
|
||||
# # set AppleTalk to turbo
|
||||
# if ! grep -q 'g_appletalk_turbo' /usr/share/gsport/config.txt; then
|
||||
# if grep -q 'bram1[00]' /usr/share/gsport/config.txt; then
|
||||
# sudo sed -i 's/^\(bram1\[00\]\)/g_appletalk_turbo = 1\n\n\1/' /usr/share/gsport/config.txt
|
||||
# else
|
||||
# echo -e '\ng_appletalk_turbo = 1' | sudo tee -a /usr/share/gsport/config.txt > /dev/null
|
||||
# fi
|
||||
# fi
|
||||
# sudo sed -i 's/^g_appletalk_turbo = 0/g_appletalk_turbo = 1/' /usr/share/gsport/config.txt
|
||||
#
|
||||
# # enable Uthernet
|
||||
# if ! grep -q 'g_ethernet[^_]' /usr/share/gsport/config.txt; then
|
||||
# if grep -q 'bram1[00]' /usr/share/gsport/config.txt; then
|
||||
# sudo sed -i 's/^\(bram1\[00\]\)/g_ethernet = 1\n\n\1/' /usr/share/gsport/config.txt
|
||||
# else
|
||||
# echo -e '\ng_ethernet = 1' | sudo tee -a /usr/share/gsport/config.txt > /dev/null
|
||||
# fi
|
||||
# fi
|
||||
# sudo sed -i 's/^g_ethernet = 0/g_ethernet = 1/' /usr/share/gsport/config.txt
|
||||
#
|
||||
#fi
|
||||
#= APPLE2PI END
|
||||
|
||||
if [[ $installEmulators ]]; then
|
||||
|
||||
@ -994,7 +1006,10 @@ if [[ $installEmulators ]]; then
|
||||
sudo chmod ugo+x /usr/local/bin/kegs-setup
|
||||
|
||||
|
||||
# GSport, if non-RPi
|
||||
#= APPLE2PI BEGIN
|
||||
# # GSport, if non-RPi
|
||||
# if [[ ! $isRpi && ! -f /usr/local/bin/gsport ]]; then
|
||||
#= APPLE2PI END
|
||||
if [[ ! $isRpi && ! -f /usr/local/bin/gsport ]]; then
|
||||
echo "A2CLOUD: Installing GSport..."
|
||||
cd /tmp/a2cloud-install
|
||||
|
||||
Loading…
Reference in New Issue
Block a user