Apple-2-Tools/a2cloud
1
0
Fork 0
mirror of https://github.com/RasppleII/a2cloud.git synced 2025-02-20 03:29:03 +00:00
Code Issues Projects Releases Wiki Activity

setup.txt: Finish cleanup of GSPort

Browse Source 
I'd begun cleaning up GSPort in a branch before we decided to drop A2Pi
and KEGS from the A2CLOUD installer.  Doing that caused the mainline
tree and my branch to differ, so I've been cleaning them both up to work
exactly the same way.  That's done now, only the branch's ### more
searchable comments are different between the two emulator installations
now.

Couldn't just merge the files because there are other changes in the
branch we don't want now, or possibly at all, so I had to do it by
balancing the trees back and forth until the part I was working on was
consistent across both.

I'll probably bring across the searchable comments next, not because
they affect anything, but because they'll assist making sure nothing is
lost as we're working quickly for a Jessie release.
This commit is contained in:
T. Joseph Carter 2016-04-05 01:02:54 -07:00
parent 546deb63d9
commit 66d67df3c6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
setup/setup.txt
View File

@ -914,7 +914,7 @@ if [[ $installEmulators ]]; then
fi
# enable AppleTalk
if ! grep -q 'g_appletalk_turbo' "$gsportConfigFile"; then
if ! grep -q '^g_appletalk_turbo' "$gsportConfigFile"; then
if grep -q 'bram1[00]' "$gsportConfigFile"; then
sudo sed -i 's/^\(bram1\[00\]\)/g_appletalk_turbo = 1\n\n\1/' "$gsportConfigFile"
else
@ -926,7 +926,7 @@ if [[ $installEmulators ]]; then
# enable Uthernet
if ! grep -q 'g_ethernet[^_]' "$gsportConfigFile"; then
if grep -q 'bram1[00]' "$gsportConfigFile"; then
sudo sed -i 's/^\(bram1\[00\]\)/g_ethernet = 1\n\n\1/' config.txt
sudo sed -i 's/^\(bram1\[00\]\)/g_ethernet = 1\n\n\1/' "$gsportConfigFile"
else
echo -e '\ng_ethernet = 1' | sudo tee -a "$gsportConfigFile" > /dev/null
fi