Apple-2-SW/a2server
1
0
Fork 0
mirror of https://github.com/RasppleII/a2server.git synced 2024-12-22 17:29:34 +00:00
Code Issues Projects Releases Wiki Activity
02ebf26cf2
a2server/scripts/a2server-1-storage.txt

26 lines
865 B
Plaintext
Raw Normal View History

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 12:29:32 +00:00
#! /bin/bash
Scripts: re-indent (tab indentation) One of the reasons I held off on doing this before is that there are a lot of complex one-line seds in here that I expect _will_ be broken by this. More than a few of these will assume, depend on, require, and break if specific hardcoded whitespace is not found. That's problematic anyway--when whitespace isn't syntactic, you shouldn't do that. So it's time to fix these anyway.
2016-10-25 19:09:52 +00:00
# vim: set tabstop=4 shiftwidth=4 noexpandtab filetype=sh:
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 12:25:44 +00:00
# --- Setting up the share volume
move /media/A2SHARED to /srv/A2SERVER
2015-12-10 01:39:09 +00:00
# 1.3.0: move /media/A2SHARED (pre-1.3.0) to /srv/A2SERVER
if [[ -d /media/A2SHARED ]]; then
Scripts: re-indent (tab indentation) One of the reasons I held off on doing this before is that there are a lot of complex one-line seds in here that I expect _will_ be broken by this. More than a few of these will assume, depend on, require, and break if specific hardcoded whitespace is not found. That's problematic anyway--when whitespace isn't syntactic, you shouldn't do that. So it's time to fix these anyway.
2016-10-25 19:09:52 +00:00
echo "A2SERVER: Moving /media/A2SHARED to /srv/A2SERVER..."
sudo /etc/init.d/netatalk stop &> /dev/null
sudo /etc/init.d/samba stop &> /dev/null
[[ ! -d /srv ]] && sudo mkdir -p /srv
sudo mv /media/A2SHARED /srv/A2SERVER
sudo sed -i 's|/media/A2SHARED|/srv/A2SERVER|g' /usr/local/etc/netatalk/AppleVolumes.default
Clean the main scripts a bit Ivan writes pretty dense scripts in some ways, but not others. Mostly he likes to collapse statements to a single line and using && and || in place of if constructs. Reduces file size and theoretically speeds execution, but it makes community development tougher and the speed gains are questionable. I've begun removing multiple successive writes to a single file such as those using tee as a means to write files as root. Clean up enough of those and you will have a noticable performance impact, although again there's no evidence there are enough of them here to see one. Removed a few dead/commented code blocks and restructured a couple of conditionals to make the no-action condition the else case. Finally, bumped the version. This isn't all that'll go into 1.5.1 but it's a start.
2016-10-27 07:55:16 +00:00
if [[ -f /etc/samba/smbd.conf ]]; then
sudo sed -i 's|/media/A2SHARED|/srv/A2SERVER|g' /etc/samba/smbd.conf
fi
move /media/A2SHARED to /srv/A2SERVER
2015-12-10 01:39:09 +00:00
fi
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 12:25:44 +00:00
Clean the main scripts a bit Ivan writes pretty dense scripts in some ways, but not others. Mostly he likes to collapse statements to a single line and using && and || in place of if constructs. Reduces file size and theoretically speeds execution, but it makes community development tougher and the speed gains are questionable. I've begun removing multiple successive writes to a single file such as those using tee as a means to write files as root. Clean up enough of those and you will have a noticable performance impact, although again there's no evidence there are enough of them here to see one. Removed a few dead/commented code blocks and restructured a couple of conditionals to make the no-action condition the else case. Finally, bumped the version. This isn't all that'll go into 1.5.1 but it's a start.
2016-10-27 07:55:16 +00:00
if [[ ! -d /srv/A2SERVER ]]; then
Scripts: re-indent (tab indentation) One of the reasons I held off on doing this before is that there are a lot of complex one-line seds in here that I expect _will_ be broken by this. More than a few of these will assume, depend on, require, and break if specific hardcoded whitespace is not found. That's problematic anyway--when whitespace isn't syntactic, you shouldn't do that. So it's time to fix these anyway.
2016-10-25 19:09:52 +00:00
echo "A2SERVER: Preparing the shared files volume..."
sudo mkdir -p /srv/A2SERVER
sudo chown $USER:$USER /srv/A2SERVER
Clean the main scripts a bit Ivan writes pretty dense scripts in some ways, but not others. Mostly he likes to collapse statements to a single line and using && and || in place of if constructs. Reduces file size and theoretically speeds execution, but it makes community development tougher and the speed gains are questionable. I've begun removing multiple successive writes to a single file such as those using tee as a means to write files as root. Clean up enough of those and you will have a noticable performance impact, although again there's no evidence there are enough of them here to see one. Removed a few dead/commented code blocks and restructured a couple of conditionals to make the no-action condition the else case. Finally, bumped the version. This isn't all that'll go into 1.5.1 but it's a start.
2016-10-27 07:55:16 +00:00
else
echo "A2SERVER: Shared volume is already prepared for use."
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 12:29:32 +00:00
fi
Reference in New Issue Copy Permalink