minor fixes and improvements
This commit is contained in:
@@ -144,6 +144,7 @@ function InstallDependenciesDebian {
|
|||||||
function InstallXOPlugins {
|
function InstallXOPlugins {
|
||||||
if [[ "$PLUGINS" ]] && [[ ! -z "$PLUGINS" ]]; then
|
if [[ "$PLUGINS" ]] && [[ ! -z "$PLUGINS" ]]; then
|
||||||
|
|
||||||
|
echo
|
||||||
echo "Installing plugins defined in PLUGINS variable"
|
echo "Installing plugins defined in PLUGINS variable"
|
||||||
echo
|
echo
|
||||||
local PLUGINSARRAY=($(echo "$PLUGINS" | tr ',' ' '))
|
local PLUGINSARRAY=($(echo "$PLUGINS" | tr ',' ' '))
|
||||||
@@ -202,7 +203,7 @@ function InstallXO {
|
|||||||
echo
|
echo
|
||||||
echo "xo-server and xo-web build quite a while. Grab a cup of coffee and lay back"
|
echo "xo-server and xo-web build quite a while. Grab a cup of coffee and lay back"
|
||||||
echo
|
echo
|
||||||
echo -n "Running installation"
|
echo -n "Running installation..."
|
||||||
cd $INSTALLDIR/xo-builds/xen-orchestra-$TIME && yarn >/dev/null && yarn build >/dev/null
|
cd $INSTALLDIR/xo-builds/xen-orchestra-$TIME && yarn >/dev/null && yarn build >/dev/null
|
||||||
echo "done"
|
echo "done"
|
||||||
|
|
||||||
@@ -274,6 +275,9 @@ function InstallXO {
|
|||||||
echo "Starting xo-server..."
|
echo "Starting xo-server..."
|
||||||
/bin/systemctl start xo-server >/dev/null
|
/bin/systemctl start xo-server >/dev/null
|
||||||
|
|
||||||
|
# no need to exit on errors anymore
|
||||||
|
set +x
|
||||||
|
|
||||||
timeout 60 bash <<-"EOF"
|
timeout 60 bash <<-"EOF"
|
||||||
while [[ -z $(journalctl -u xo-server | sed -n 'H; /Starting XO Server/h; ${g;p;}' | grep "http:\/\/\[::\]:$PORT") ]]; do
|
while [[ -z $(journalctl -u xo-server | sed -n 'H; /Starting XO Server/h; ${g;p;}' | grep "http:\/\/\[::\]:$PORT") ]]; do
|
||||||
echo "waiting port to be open"
|
echo "waiting port to be open"
|
||||||
|
Reference in New Issue
Block a user