fix indentation, extra spaces and add comment

This commit is contained in:
ronivay
2017-08-29 20:50:04 +03:00
parent 4d2c48129f
commit 4d37ca1edf

View File

@@ -168,7 +168,7 @@ function InstallXO {
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 xo-server install..." echo -n "Running xo-server install..."
cd $INSTALLDIR/xo-builds/xo-server-$TIME && yarn > /dev/null 2>$LOGFILE && yarn run build > /dev/null 2>$LOGFILE cd $INSTALLDIR/xo-builds/xo-server-$TIME && yarn >/dev/null 2>$LOGFILE && yarn run build >/dev/null 2>$LOGFILE
echo "done" echo "done"
echo -n "Running xo-web install..." echo -n "Running xo-web install..."
cd $INSTALLDIR/xo-builds/xo-web-$TIME && yarn >/dev/null 2>$LOGFILE && yarn run build >/dev/null 2>$LOGFILE cd $INSTALLDIR/xo-builds/xo-web-$TIME && yarn >/dev/null 2>$LOGFILE && yarn run build >/dev/null 2>$LOGFILE
@@ -229,15 +229,15 @@ function InstallXO {
chown -R $XOUSER:$XOUSER $INSTALLDIR/xo-builds/xo-server-$TIME chown -R $XOUSER:$XOUSER $INSTALLDIR/xo-builds/xo-server-$TIME
if [ ! -d /var/lib/xo-server ]; then if [ ! -d /var/lib/xo-server ]; then
mkdir /var/lib/xo-server 2>/dev/null mkdir /var/lib/xo-server 2>/dev/null
fi fi
chown $XOUSER:$XOUSER /var/lib/xo-server chown $XOUSER:$XOUSER /var/lib/xo-server
fi fi
echo echo
echo "Starting xo-server..." echo "Starting xo-server..."
/bin/systemctl start xo-server > /dev/null /bin/systemctl start xo-server >/dev/null
timeout 60 bash <<-"EOF" timeout 60 bash <<-"EOF"
while [[ -z $(journalctl -u xo-server | grep "http:\/\/\[::\]:$PORT") ]]; do while [[ -z $(journalctl -u xo-server | grep "http:\/\/\[::\]:$PORT") ]]; do
@@ -349,6 +349,7 @@ read -p ": " option
read -p "[y/N]: " answer read -p "[y/N]: " answer
case $answer in case $answer in
y) y)
echo "Stopping xo-server..."
/bin/systemctl stop xo-server || { echo "failed to stop service, exiting..." ; exit 1; } /bin/systemctl stop xo-server || { echo "failed to stop service, exiting..." ; exit 1; }
;; ;;
n) n)