From abcfd988139083d0587195819cf0dd94d57d8fd2 Mon Sep 17 00:00:00 2001
From: ronivay <roni@vayrynen.info>
Date: Tue, 15 Jan 2019 13:51:40 +0200
Subject: [PATCH] fix wrong set flag and reset trap setting so that service
 startup logs end up to logfile, if it fails

---
 xo-install.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/xo-install.sh b/xo-install.sh
index 747e877..a8227db 100755
--- a/xo-install.sh
+++ b/xo-install.sh
@@ -483,8 +483,9 @@ function InstallXO {
 	echo "Starting xo-server..."
 	/bin/systemctl start xo-server >/dev/null
 
-	# no need to exit on errors anymore
-	set +x
+	# no need to exit/trap on errors anymore
+	set +e
+	trap - ERR INT
 
 	timeout 60 bash <<-"EOF"
 		while [[ -z $(journalctl -u xo-server | sed -n 'H; /Starting XO Server/h; ${g;p;}' | grep "https\{0,1\}:\/\/\[::\]:$PORT") ]]; do
@@ -503,6 +504,7 @@ function InstallXO {
 	else
 		echo
 		echo "Looks like there was a problem when starting xo-server/reading journalctl. Please see logs for more details"
+		journalctl -u xo-server -n 50 >> $LOGFILE
 		exit 1
 	fi