X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=scripts%2Fxds-start-server.sh;h=66da261fd4f85331b42693d1e5f96f97e5ba15be;hb=63f550ad8dc0061b1e010138d7fbbb55318550d4;hp=68884738ab2b9d7c3ddd74310b5339e6f42e2bd1;hpb=40a7183f3b4aa32379aa8b4949f5f9c5e32f79f6;p=src%2Fxds%2Fxds-server.git

diff --git a/scripts/xds-start-server.sh b/scripts/xds-start-server.sh
index 6888473..66da261 100755
--- a/scripts/xds-start-server.sh
+++ b/scripts/xds-start-server.sh
@@ -2,55 +2,46 @@
 
 # Configurable variables
 [ -z "$BINDIR" ] && BINDIR=/usr/local/bin
-[ -z "$ST_CONFDIR" ] && ST_CONFDIR=$HOME/.xds/syncthing-config
 [ -z "$XDS_CONFFILE" ] && XDS_CONFFILE=$HOME/.xds/config.json
+[ -z "$XDS_SHAREDIR" ] && XDS_SHAREDIR=$HOME/.xds/share
+[ -z "$ST_CONFDIR" ] && ST_CONFDIR=$HOME/.xds/syncthing-config
 [ -z "$LOGLEVEL" ] && LOGLEVEL=warn
-[ -z "$LOGDIR" ] && LOGDIR=/tmp/xds-logs
+[ -z "$LOGDIR" ] && LOGDIR=/tmp/xds-server/logs
 [ -z "$PORT_GUI" ] && PORT_GUI=8384
 [ -z "$API_KEY" ] && API_KEY="1234abcezam"
 
 
-mkdir -p ${LOGDIR}
-LOG_XDS=${LOGDIR}/xds-server.log
-LOG_SYNC=${LOGDIR}/syncthing.log
-LOG_SYNCI=${LOGDIR}/syncthing-inotify.log
-
-echo "### Info"
-echo "XDS server config: $XDS_CONFFILE"
-echo "Syncthing GUI on port: $PORT_GUI"
-echo "Syncthing Config: $ST_CONFDIR"
-echo "XDS server output redirected in: $LOG_XDS"
-echo "Syncthing-inotify output redirected in: $LOG_SYNCI"
-echo "Syncthing output redirected in: $LOG_SYNC"
-echo ""
-
-pwd
-[[ -f $BINDIR/xds-server ]] || { BINDIR=$(cd `dirname $0` && pwd); }
-pwd
 [[ -f $BINDIR/xds-server ]] || { echo "Cannot find xds-server in BINDIR !"; exit 1; }
 
-echo "### Start syncthing-inotify:"
-$BINDIR/syncthing-inotify --home=$ST_CONFDIR -target=http://localhost:$PORT_GUI -verbosity=4 > $LOG_SYNCI  2>&1 &
-pid_synci=$(jobs -p)
-echo "pid=${pid_synci}"
+# Create config.json file when needed
+[[ -f ${XDS_CONFFILE} ]] || { mv ${XDS_CONFFILE} ${XDS_CONFFILE}.old; }
+
+cat <<EOF > ${XDS_CONFFILE}
+{
+    "webAppDir": "webapp/dist",
+    "shareRootDir": "${XDS_SHAREDIR}",
+    "logsDir": "${LOGDIR}",
+    "sdkRootDir": "/xdt/sdk",
+    "syncthing": {
+        "binDir": "${BINDIR}",
+        "home": "${ST_CONFDIR}",
+        "gui-address": "http://localhost:${PORT_GUI}",
+        "gui-apikey": "${API_KEY}"
+    }
+}
+EOF
+
+echo "### Configuration in config.json: "
+cat ${XDS_CONFFILE}
 echo ""
 
-echo "### Start Syncthing:"
-STNODEFAULTFOLDER=1 $BINDIR/syncthing --home=$ST_CONFDIR -no-browser -verbose --gui-address=0.0.0.0:$PORT_GUI -gui-apikey=${API_KEY} > $LOG_SYNC 2>&1 &
-pid_sync=$(jobs -p)
-echo "pid=${pid_sync}"
-echo ""
+mkdir -p ${LOGDIR}
+LOG_XDS=${LOGDIR}/xds-server.log
 
-if [ "$1" == "-noserver" ]; then
-    echo "## XDS server NOT STARTED"
-    echo "  Command to start it:"
-    echo "  $BINDIR/xds-server --config $XDS_CONFFILE -log $LOGLEVEL > $LOG_XDS 2>&1"
-else
-    # Wait a bit so make connection to Syncthing possible
-    sleep 1
-    echo "### Start XDS server"
+echo "### Start XDS server"
+echo " $BINDIR/xds-server --config $XDS_CONFFILE -log $LOGLEVEL > $LOG_XDS 2>&1"
+if [ "$1" != "-dryrun" ]; then
     $BINDIR/xds-server --config $XDS_CONFFILE -log $LOGLEVEL > $LOG_XDS 2>&1 &
     pid_xds=$(jobs -p)
     echo "pid=${pid_xds}"
 fi
-echo ""