Skip to content
This repository has been archived by the owner on Jul 11, 2019. It is now read-only.

Updated build.sh #422

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Updated build.sh #422

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 71 additions & 25 deletions build.sh
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,10 @@ OPTIONS:
-c file Use the given buildout config file
-A Do not start now
-S Do not configure system services
-s Install only non-superuser parts
-s Install/Reinstall only non-superuser parts
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are you changing this and the other unrelated things below? That doesn't look right.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is only a github artifact.

-u Install only superuser parts
-U Set the username adhocracy should run as
-b Branch to check out
-R Rebuild everything, do not use any caches
EOF
}

Expand All @@ -39,7 +38,6 @@ adhoc_user=$USER
install_mysql_client=false
arch_install=false
branch=$DEFAULT_BRANCH
always_rebuild=false

if [ -n "$SUDO_USER" ]; then
adhoc_user=$SUDO_USER
Expand All @@ -48,7 +46,7 @@ fi
PKGS_TO_INSTALL=''
PKG_INSTALL_CMD=''

while getopts DpMmASsuc:U:b:R name
while getopts DpMmASsuc:U:b:R:o name
do
case $name in
M) install_mysql_client=true;;
Expand All @@ -59,7 +57,6 @@ do
U) adhoc_user=$OPTARG;;
c) buildout_cfg_file=$OPTARG;;
b) branch=$OPTARG;;
R) always_rebuild=true;;
?) usage
exit 2;;
*) echo "Invalid option $name!"
Expand All @@ -75,15 +72,13 @@ if which apt-get >/dev/null ; then
PYTHON_CMD='python'
PIP_CMD='pip'
PKG_INSTALL_CMD='apt-get install -yqq'
VIRTUALENV_CMD='virtualenv'
fi

if which pacman >/dev/null ; then
distro='arch'
PYTHON_CMD='python2'
PIP_CMD='pip2'
PKG_INSTALL_CMD='pacman -S --needed --noconfirm'
VIRTUALENV_CMD='virtualenv2'
fi

if [ -z "$distro" ] ; then
Expand Down Expand Up @@ -156,18 +151,44 @@ else
buildout_cfg_file=buildout.cfg
fi

#--------------------------------------------
if [ ! -f $buildout_cfg_file ]; then
DOMAIN="adhocracy.lan"
else
DOMAIN_cfg=$(awk '/\[domains\]/, /main = /' $buildout_cfg_file)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should write this shorter.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, this matches

[domains]
x=12
[other]
main=1234

DOMAIN=$(echo $DOMAIN_cfg | sed -n 's/.* //p')
#
ADHOCRACY_PORT_cfg=$(awk '/(\[ports\])/, /main = /' "$buildout_cfg_file")
ADHOCRACY_PORT=$(echo $ADHOCRACY_PORT_cfg | sed -n 's/.* //p')
#
memcached_cfg=$(awk '/(\[ports\])/, /memcached = /' "$buildout_cfg_file")
memcached_port=$(echo $memcached_cfg | sed -n 's/.* //p')
#
redis_cfg=$(awk '/(\[ports\])/, /redis = /' "$buildout_cfg_file")
redis_port=$(echo $redis_cfg | sed -n 's/.* //p')
#
solr_cfg=$(awk '/(\[ports\])/, /solr = /' "$buildout_cfg_file")
solr_port=$(echo $solr_cfg | sed -n 's/.* //p')
#
supervisor_cfg=$(awk '/(\[ports\])/, /supervisor = /' "$buildout_cfg_file")
supervisor_port=$(echo $supervisor_cfg | sed -n 's/.* //p')
#
SUPERVISOR_PORTS="$memcached_port $redis_port $supervisor_port"
fi
#--------------------------------------------

if ! $not_use_sudo_commands; then
case $distro in
debian )
PKGS_TO_INSTALL=$PKGS_TO_INSTALL' libpng-dev libjpeg-dev gcc make build-essential bin86 unzip libpcre3-dev zlib1g-dev git mercurial python python-virtualenv python-dev libsqlite3-dev openjdk-6-jre libpq-dev'
PKGS_TO_INSTALL=$PKGS_TO_INSTALL' gcc make build-essential bin86 unzip libpcre3-dev git mercurial python python-setuptools libssl-dev libbz2-dev libsqlite3-dev openjdk-6-jre libpq-dev'
PKGS_TO_INSTALL=$PKGS_TO_INSTALL' openssh-client mutt'

if $install_mysql_client; then
PKGS_TO_INSTALL=$PKGS_TO_INSTALL' libmysqlclient-dev'
fi
;;
arch )
PKGS_TO_INSTALL=$PKGS_TO_INSTALL' libpng libjpeg gcc make base-devel bin86 unzip zlib git mercurial python2 python2-virtualenv python2-pip sqlite jre7-openjdk postgresql-libs'
PKGS_TO_INSTALL=$PKGS_TO_INSTALL' gcc make base-devel bin86 unzip git mercurial python2 sqlite jre7-openjdk postgresql-libs'
PKGS_TO_INSTALL=$PKGS_TO_INSTALL' openssh mutt'

if $install_mysql_client; then
Expand All @@ -194,24 +215,24 @@ if ! $not_use_sudo_commands; then
debian )
SERVICE_CMD='update-rc.d'
SERVICE_CMD_PREFIX='defaults'
INIT_FILE='/etc/init.d/adhocracy_services'
INIT_FILE='/etc/init.d/'$DOMAIN
;;
arch )
SERVICE_CMD='systemctl enable'
INIT_FILE='/etc/rc.d/adhocracy_services'
INIT_FILE='/etc/rc.d/'$DOMAIN
echo "
[Unit]
Description=Adhocracy Daemon

[Service]
Type=forking
ExecStart=/bin/sh /etc/rc.d/adhocracy_services start
ExecStop=/bin/sh /etc/rc.d/adhocracy_services stop
ExecStatus=/bin/sh /etc/rc.d/adhocracy_services status
ExecStart=/bin/sh /etc/rc.d/$DOMAIN start
ExecStop=/bin/sh /etc/rc.d/$DOMAIN stop
ExecStatus=/bin/sh /etc/rc.d/$DOMAIN status

[Install]
WantedBy=multi-user.target
" | $SUDO_CMD tee >/dev/null /etc/systemd/system/adhocracy_services.service
" | $SUDO_CMD tee >/dev/null /etc/systemd/system/$DOMAIN.service
;;
esac
echo "$stmpl" | \
Expand All @@ -220,7 +241,7 @@ WantedBy=multi-user.target
-e "s#\${domains:main}#supervisord#" | \
$SUDO_CMD tee "$INIT_FILE" >/dev/null
$SUDO_CMD chmod a+x "$INIT_FILE"
$SUDO_CMD $SERVICE_CMD adhocracy_services $SERVICE_CMD_PREFIX
$SUDO_CMD $SERVICE_CMD $DOMAIN $SERVICE_CMD_PREFIX
fi
fi

Expand Down Expand Up @@ -270,16 +291,40 @@ if [ '!' -e adhocracy_buildout/.git ]; then
fi

cd adhocracy_buildout
# Work around a bug in bootstrap.py where it forgets to create eggs/, but tries to write to eggs/tmpaIRxDN
mkdir -p eggs
BUILDOUT_VERSION=1.7.0
cur_installed="$(find eggs -maxdepth 1 -name "zc.buildout-${BUILDOUT_VERSION}-*" -print -quit 2>/dev/null)"
if $always_rebuild || test -z "$cur_installed"; then
python bootstrap.py "--version=$BUILDOUT_VERSION"

if [ '!' -e python/buildout.python/src ]; then
git submodule init
git submodule update
fi

# Install local python if necessary
if [ '!' -x bin/python ]; then
if [ '!' -f python/bin/buildout ]; then
(cd python && python bootstrap.py)
fi
(cd python && bin/buildout)
fi
# Fix until https://github.com/collective/buildout.python/pull/31 is accepted
find python/buildout.python/ -name *pyc -delete
# Fix until https://github.com/collective/buildout.python/pull/32 is accepted
if [ "$(strings bin/python | grep '^PyUnicodeUCS._DecodeLatin1$')" '!=' "$(strings eggs/lxml-*.egg/lxml/etree.so 2>/dev/null | grep '^PyUnicodeUCS._DecodeLatin1$')" ]; then
rm -rf -- eggs/lxml-*.egg
fi

# Set up adhocracy configuration
ln -s -f "${buildout_cfg_file}" ./buildout_current.cfg
bin/buildout -c "buildout_current.cfg"

# bootstrap our buildout if it is outdated or not available
HAVE_BUILDOUT_VERSION=$(bin/buildout --version 2>&1 | cut -d ' ' -f 3)
WANT_BUILDOUT_VERSION=$(sed -n 's#zc\.buildout = ##p' versions.cfg)
if test "$HAVE_BUILDOUT_VERSION" "!=" "$WANT_BUILDOUT_VERSION"; then
bin/python bootstrap.py -c buildout_current.cfg
fi

# Install adhocracy
bin/buildout -c buildout_current.cfg

# Install adhocracy interactive script
echo '#!/bin/sh
set -e
cd "$(dirname $(dirname $(readlink -f $0)))"
Expand All @@ -295,12 +340,13 @@ exec bin/paster serve --reload etc/adhocracy-interactive.ini
' > "bin/adhocracy_interactive.sh"
chmod a+x "bin/adhocracy_interactive.sh"

# Autostart adhocracy
if $autostart; then
bin/supervisord
echo "Use ${ROOTDIR_FROM_CALLER}bin/supervisorctl to control running services."
python scripts/check_port_free.py -o -g 20 ${SUPERVISOR_PORTS}
if bin/supervisorctl status | grep -vq RUNNING; then
sleep 2 # Wait for supervisord to register that everything's running
sleep 5 # Wait for supervisord to register that everything's running
if bin/supervisorctl status | grep -vq RUNNING; then
echo 'Failed to start all services:'
bin/supervisorctl status
Expand All @@ -319,5 +365,5 @@ if $autostart; then
echo
echo "Type ${ROOTDIR_FROM_CALLER}bin/adhocracy_interactive.sh to run the interactive paster daemon."
echo "Then, navigate to http://127.0.0.1:${ADHOCRACY_PORT}/ to see adhocracy!"
echo "Use the username \"admin\" and password \"password\" to login."
echo "Use the email \"admin@${DOMAIN}\" and password \"password\" to login."
fi