Commit Graph

35 Commits

Author SHA1 Message Date
T. Joseph Carter
847932886a Do apt-get install only once
The Raspberry Pi takes awhile to run any operation involving apt-get.
As such, we should condense apt-get commands as much as possible.
2015-10-12 15:34:57 -07:00
T. Joseph Carter
c7800207f3 Merge branch 'master' of https://github.com/rasppleii/a2server 2015-10-12 15:25:50 -07:00
T. Joseph Carter
a8af3aaba9 Towards using askYesNo everywhere
Need to stop where I am to merge bugfixes from upstream.  :)
2015-10-12 15:24:07 -07:00
T. Joseph Carter
dda5694dca More overzealous ${scriptURL} fixing 2015-10-12 12:30:17 -07:00
T. Joseph Carter
a9648d52a4 Fix an ivanx.com that should be hardcoded
Overzealous replacement of hardcoded ivanx.com with script variable.
The A2CLOUD disk image should be downloaded right off Ivan's server
because we don't have it in the git repository.
2015-10-12 05:51:16 -07:00
T. Joseph Carter
63d4ce2b51 Make askYesNo use a here document for info text
The info text for askYesNo was a problem.  First, it involved a long,
complex, paragraph encoded as string on the command line.  That's NEVER
a good idea.  Secondly, it passed that string unprocessed to printf
(albeit printf(1) but still) as a format string.  And third, there's no
way to manage line length when you're doing that.

The alternative is to put the strings in a here document.  We then cat
the result between a couple of empty echo commands to create the
original output.  This addresses all of the above issues, but creates a
new one: The info text follows the prompt, rather than the other way
around.  Not the most elegant.

So … why do this at all, why not just echo the info text outside of the
function, particularly since the function only echoes it once no matter
how many times you give a bogus answer?  Well, if at some point we
decide to implement a dialog-type interface (whiptail, zenity, whatever
you prefer), then it becomes easy to do so.  Unsure that's desirable at
this time, but options are good.
2015-10-12 02:59:42 -07:00
T. Joseph Carter
029c7eceb1 Merge branch 'master' of https://github.com/rasppleii/a2server 2015-10-12 02:39:59 -07:00
T. Joseph Carter
14b962f48d Fix to match Ivan's path for versionhistory.txt
This file really belongs in the A2SERVER root where people looking at
this tree can most easily find it, but for now it's more important to
follow the layout on Ivan's server.  Putting it in the root was a
mistake on my part in my initial upload because "of course".  Corrected!
2015-10-12 02:34:51 -07:00
T. Joseph Carter
eceac43f7b Merge branch 'master' of https://github.com/rasppleii/a2server 2015-10-09 06:12:42 -07:00
Joseph Carter
cfc514e09a Merge pull request #4 from iKarith/run-anywhere
Make A2SERVER scripts usable from arbitrary server
2015-10-09 06:05:49 -07:00
T. Joseph Carter
f95c1fcc08 Merge branch 'master' of https://github.com/rasppleii/a2server 2015-10-09 05:52:17 -07:00
T. Joseph Carter
13ad54c876 Reflowed shell scripts—breaks outstanding PRs
Reflowed the scripts (mostly) according to vim's autoindent engine.
Also added vim modelines so that people who are familiar with them can
configure their environment for A2SERVER's conventions.  Also removed
trailing whitespace from lines and files while I was at it to make git
happier about various things.
2015-10-09 05:29:32 -07:00
T. Joseph Carter
89015fc18e Add yes/no prompt function
This is mostly a "pretty interface" thing, and it currently only affects
the setup script.
2015-10-08 14:07:46 -07:00
T. Joseph Carter
c9e0345497 Change autoAnswerYes to autoAnswerDefault
This should allow questions to be created whose default is no without
convoluted asking of the opposite question.
2015-10-08 12:51:54 -07:00
T. Joseph Carter
9601ed3e14 Remove trailing whitespace
An unusual quirk of git is that it tends not to like trailing whitespace
at the end of lines, and trailing blank lines at the end of a file.  It
messes with the word diffs a bit I think.  Anyway, it's easily removed,
so I've removed it.
2015-10-05 23:52:43 -07:00
T. Joseph Carter
4125590bdb Update changelog 2015-10-04 09:23:48 -07:00
T. Joseph Carter
be69408368 Update README.md a little 2015-10-04 09:08:44 -07:00
T. Joseph Carter
892fceff79 Merge branch 'master' of https://github.com/rasppleii/a2server 2015-10-04 08:55:58 -07:00
T. Joseph Carter
554baff892 Move tools to scripts/tools
Who's handing out the paper bags for this one?
2015-10-04 08:54:16 -07:00
T. Joseph Carter
616a384815 Bump version to 1.25
End-user functionality has changed warranting a version bump when these
changes are released.
2015-10-04 08:00:24 -07:00
T. Joseph Carter
0afbc6dba1 Add A2SERVER_SCRIPT_URL to aliases
This should theoretically make the a2server-setup and a2server-update
aliases use/honor A2SERVER_SCRIPT_URL if it's set.  How this is done is
presently kind of ugly since it invokes a subshell to ensure the URL
ends in a slash, so if someone has a better idea of how to do that in a
bash alias, please file a ticket!
2015-10-04 07:51:34 -07:00
T. Joseph Carter
171ffb52d8 Add shebang line to a2server-aliases
FWIW the reason why I keep adding shebang lines to these scripts that
get sourced (and therefore don't need them) is that it alerts a few text
editors that offer syntax highlighting based on magic numbers in files
that they are in fact bash scripts and contain bashisms that shouldn't
be flagged as errors in strict bourne shells.
2015-10-04 07:37:11 -07:00
T. Joseph Carter
e216e5fbe3 Change mode for a2server-help.txt to 644
Turns out a2server-help isn't actually a script, it's actually a text
file which is more'd by an alias of the same name.  We could cleverly
replace that alias with a very clever shebang line, but ... principle of
least resistance.
2015-10-04 07:31:11 -07:00
T. Joseph Carter
eb6c0ede94 Merge branch 'master' of https://github.com/rasppleii/a2server 2015-10-04 07:20:49 -07:00
T. Joseph Carter
42aba9c1d0 Rename setup/update scripts
This is perhaps less than ideal, but it should make the scripts work in
any web directory you put the repository into.  As such, this should be
considered part of the "initial state" trying to match Ivan's current
non-SCM setup.  We can adjust this later if he does something different
on his end.
2015-10-04 07:16:33 -07:00
T. Joseph Carter
224a9b0005 Make all scripts executable 2015-10-04 02:27:30 -07:00
T. Joseph Carter
93b492d3a4 Missed a couple of Ivan's scripts 2015-10-04 02:26:20 -07:00
T. Joseph Carter
a20d02ce2e Merge branch 'master' of https://github.com/rasppleii/a2server 2015-10-04 02:23:51 -07:00
T. Joseph Carter
36d15356c7 Added the other A2SERVER scripts
These also come from @IvanExpert's ivanx server, and I believe he's the
author of all of them.  He can correct me if I'm wrong on that.
2015-10-04 02:20:54 -07:00
T. Joseph Carter
ff2da76e84 Get Ivan's precompiled binaries from his server
Ivan's precompiled binaries of nulib2, The Unarchiver, and netatalk for
Debian and Raspbian aren't going to be part of this repository, so I've
reverted to hardcoding Ivan's server as the source of those things.

We could perhaps download and compile nulib2 and The Unarchiver, and
we'd have to if the script doesn't recognize Debian/Raspbian.  Ideally
for those systems we'd download .deb packages with full and proper
dependency tracking, but we'd still need source for use on non-Debian
systems, should we ever develop support for those.  (OS X is a good
candidate for such a system?)
2015-10-04 02:04:52 -07:00
T. Joseph Carter
982836dc7c A2SERVER_SCRIPT_URL variable added
Added shell variable A2SERVER_SCRIPT_URL which allows you to replace
Ivan's server with another URL for development.  If unset, scripts will
default to "http://appleii.ivanx.com/a2server/" as usual.

This will not allow you to use these scripts for development directly,
and in fact may have been over-zealous in removing hardcoded ivanx
links.  Also, Ivan's webserver has a slightly different layout than this
repository because I haven't tried to make this an apache directory
structure full of mixed HTML, scripts, .htaccess files, etc.
2015-10-04 01:23:53 -07:00
T. Joseph Carter
8882392383 Make scripts executable, add shebang lines 2015-10-04 00:12:32 -07:00
T. Joseph Carter
e512276930 Add Ivan's versionhistory.txt 2015-10-03 23:24:57 -07:00
T. Joseph Carter
ae14808b80 Import Ivan's A2SERVER scripts
This reflects Ivan Drucker's current A2SERVER scripts as of 2015-Oct-01,
version 1.24.  These are unmodified and cannot be directly used yet.  A
later patch will begin correcting that, but a baseline is important.
2015-10-03 05:25:44 -07:00
Joseph Carter
c687b6e4f1 Initial commit 2015-10-03 05:21:50 -07:00