fix wo.sh

This commit is contained in:
VirtuBox
2019-04-10 17:18:24 +02:00
parent dc27235220
commit 10f4e8269e
3 changed files with 11 additions and 7 deletions

View File

@@ -27,6 +27,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- "wo maintenance" command to perform server package update & cleanup
- Support for Netdata on backend : https://server.hostname:22222/netdata/
- New Stacks : composer and netdata
- additional argument for letsencrypt : --hsts
- wo.sh installer downloader script
#### Changed

View File

@@ -382,12 +382,8 @@ wo_install_acme_sh() {
# Now, finally, let's install WordOps
wo_install() {
{
rm -rf /tmp/easyengine
rm -rf /tmp/wordops
git clone -b "$wo_branch" https://github.com/WordOps/WordOps.git /tmp/wordops --quiet
cd /tmp/wordops || exit 1
cd /tmp/WordOps || exit 1
} >> "$wo_install_log" 2>&1
python3 setup.py install

10
wo.sh
View File

@@ -23,14 +23,20 @@ fi
apt-get update -qq && apt-get install git -qq
} > /dev/null 2>&1
if [ "${#}" = "0" ]; then
wo_branch=master
else
wo_branch="$@"
fi
# update or clone wordops repositoru
if [ -d /tmp/WordOps/.git ]; then
git -C /tmp/WordOps pull origin master -q
else
rm -rf /tmp/WordOps
git clone https://github.com/WordOps/WordOps.git /tmp/WordOps -b "$@" -q
git clone https://github.com/WordOps/WordOps.git /tmp/WordOps -b "$wo_branch" -q
fi
if [ -x /tmp/WordOps/install ]; then
/tmp/WordOps/install "$@"
/tmp/WordOps/install "$wo_branch"
fi