Skip to content
This repository was archived by the owner on Apr 13, 2020. It is now read-only.

Startup script cleanup #31

Merged
merged 3 commits into from
Oct 30, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added logs/.keep
Empty file.
2 changes: 1 addition & 1 deletion startpc.bat
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ REM. set JAVA=%JAVA_HOME%\bin\java
set EXT="-Djava.util.Arrays.useLegacyMergeSort=true"

REM. optionally limit memory here
REM. set MEM="-Xmx32m -XX:PermSize=32m -XX:MaxPermSize=48m"
REM. set MEM="-Xmx32m"

set LOG4J=-Dlog4j.configuration=file:/%SIGNALK_HOME%/conf/log4j.properties

Expand Down
21 changes: 6 additions & 15 deletions startpc.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
#!/bin/bash
#
# start script for freeboard on a linux pc or maybe on a mac too
#
#SIGNALK_HOME=/home/pi/freeboard
SIGNALK_HOME=`pwd`

JAR=signalk-server-0.0.1-SNAPSHOT-jar-with-dependencies.jar
#
cd $SIGNALK_HOME
mkdir logs
# start script for signalk-server-java

JAR="signalk-server-java-0.0.1-SNAPSHOT-jar-with-dependencies.jar"

#temporary until linux-arm.jar is in purejavacom.jar
export LD_LIBRARY_PATH=$SIGNALK_HOME/jna
Expand All @@ -27,11 +21,8 @@ if [ -n "$JAVA_HOME" ]; then
fi

EXT="-Djava.util.Arrays.useLegacyMergeSort=true"
MEM="-Xmx32m -XX:PermSize=32m -XX:MaxPermSize=48m"
MEM="-Xmx32m"

LOG4J=-Dlog4j.configuration=file://$SIGNALK_HOME/conf/log4j.properties
LOG4J=-Dlog4j.configuration=file://./conf/log4j.properties

cd $SIGNALK_HOME
echo "Starting: $JAVA $EXT $LOG4J $MEM -jar target/$JAR >>logs/start.log 2>&1 &" >>logs/start.log 2>&1 &
$JAVA $EXT $LOG4J $MEM -jar target/$JAR
#>>logs/start.log 2>&1 &
$JAVA $EXT $LOG4J $MEM -jar target/$JAR