GuillaumeHemmen/projectlibre-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/projectlibre/code synced 2024-11-01 03:21:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes in startup scripts

Browse source
This commit is contained in:
Laurent Chretienneau 2014-04-25 12:19:22 +02:00
parent cbf5f16ecc
commit edbcc03989
2 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
openproj_build/resources/projectlibre
View file

@ -69,7 +69,6 @@ OPENPROJ_HOME="$OPENPROJ_HOME0"
LOG_LEVEL="DEBUG" LOG_LEVEL="DEBUG"
LOG_FILE="/dev/null" LOG_FILE="/dev/null"
AUTO_CONFIGURATION="1" AUTO_CONFIGURATION="1"
ARGS="$@"
JAVA_OK="0" JAVA_OK="0"
FIRST_JAVA_WITH_CORRECT_VERSION="" FIRST_JAVA_WITH_CORRECT_VERSION=""
OS_NAME=`uname` OS_NAME=`uname`
@ -156,11 +155,11 @@ check_java() {
fi fi
} }
run_openproj() { run_openproj() { # call function with parameters to hand over
if [ "$LOG_LEVEL" ] && [ "x$LOG_LEVEL" = "xDEBUG" ]; then if [ "$LOG_LEVEL" ] && [ "x$LOG_LEVEL" = "xDEBUG" ]; then
"$JAVA_EXE" $JAVA_OPTS -jar "$OPENPROJ_HOME/projectlibre.jar" $ARGS > "$LOG_FILE" "$JAVA_EXE" $JAVA_OPTS -jar "$OPENPROJ_HOME/projectlibre.jar" "$@" > "$LOG_FILE"
else else
"$JAVA_EXE" $JAVA_OPTS -jar "$OPENPROJ_HOME/projectlibre.jar" $ARGS > /dev/null 2>&1 "$JAVA_EXE" $JAVA_OPTS -jar "$OPENPROJ_HOME/projectlibre.jar" "$@" > /dev/null 2>&1
fi fi
} }
@ -180,9 +179,7 @@ if [ -f "$RUN_CONF" ]; then
OPENPROJ_HOME="$OPENPROJ_HOME0" OPENPROJ_HOME="$OPENPROJ_HOME0"
#OPENPROJ_HOME can be harmful with multiple versions. disable #OPENPROJ_HOME can be harmful with multiple versions. disable
JAVA_OK="1" JAVA_OK="1"
ARGS0="$ARGS" run_openproj --silentlyFail true "$@" || if [[ $? -eq 126 || $? -eq 127 || $? -eq 64 ]]; then
ARGS="--silentlyFail true $ARGS"
run_openproj || if [[ $? -eq 126 || $? -eq 127 || $? -eq 64 ]]; then
#126 command invoked cannot execute #126 command invoked cannot execute
#127 command not found #127 command not found
#64 bad java version/impl #64 bad java version/impl
@ -191,7 +188,6 @@ if [ -f "$RUN_CONF" ]; then
#auto-detection will be performed #auto-detection will be performed
fi fi
fi fi
ARGS="$ARGS0"
fi fi
if [ "$JAVA_OK" -eq "0" ]; then if [ "$JAVA_OK" -eq "0" ]; then
@ -307,13 +303,13 @@ if [ "$JAVA_OK" -eq "0" ]; then
fi fi
if [ "$JAVA_OK" -eq "1" ]; then if [ "$JAVA_OK" -eq "1" ]; then
run_openproj run_openproj "$@"
else else
if [ "x$FIRST_JAVA_WITH_CORRECT_VERSION" != "x" ]; then if [ "x$FIRST_JAVA_WITH_CORRECT_VERSION" != "x" ]; then
echo "Trying $FIRST_JAVA_WITH_CORRECT_VERSION ..." echo "Trying $FIRST_JAVA_WITH_CORRECT_VERSION ..."
JAVA_EXE="$FIRST_JAVA_WITH_CORRECT_VERSION" JAVA_EXE="$FIRST_JAVA_WITH_CORRECT_VERSION"
create_run_conf create_run_conf
run_openproj run_openproj "$@"
echo $? echo $?
fi fi
fi fi

16
openproj_build/resources/projectlibre.sh
View file

@ -69,7 +69,6 @@ OPENPROJ_HOME="$OPENPROJ_HOME0"
LOG_LEVEL="DEBUG" LOG_LEVEL="DEBUG"
LOG_FILE="/dev/null" LOG_FILE="/dev/null"
AUTO_CONFIGURATION="1" AUTO_CONFIGURATION="1"
ARGS="$@"
JAVA_OK="0" JAVA_OK="0"
FIRST_JAVA_WITH_CORRECT_VERSION="" FIRST_JAVA_WITH_CORRECT_VERSION=""
OS_NAME=`uname` OS_NAME=`uname`
@ -156,11 +155,11 @@ check_java() {
fi fi
} }
run_openproj() { run_openproj() { # call function with parameters to hand over
if [ "$LOG_LEVEL" ] && [ "x$LOG_LEVEL" = "xDEBUG" ]; then if [ "$LOG_LEVEL" ] && [ "x$LOG_LEVEL" = "xDEBUG" ]; then
"$JAVA_EXE" $JAVA_OPTS -jar "$OPENPROJ_HOME/projectlibre.jar" $ARGS > "$LOG_FILE" "$JAVA_EXE" $JAVA_OPTS -jar "$OPENPROJ_HOME/projectlibre.jar" "$@" > "$LOG_FILE"
else else
"$JAVA_EXE" $JAVA_OPTS -jar "$OPENPROJ_HOME/projectlibre.jar" $ARGS > /dev/null 2>&1 "$JAVA_EXE" $JAVA_OPTS -jar "$OPENPROJ_HOME/projectlibre.jar" "$@" > /dev/null 2>&1
fi fi
} }
@ -180,9 +179,7 @@ if [ -f "$RUN_CONF" ]; then
OPENPROJ_HOME="$OPENPROJ_HOME0" OPENPROJ_HOME="$OPENPROJ_HOME0"
#OPENPROJ_HOME can be harmful with multiple versions. disable #OPENPROJ_HOME can be harmful with multiple versions. disable
JAVA_OK="1" JAVA_OK="1"
ARGS0="$ARGS" run_openproj --silentlyFail true "$@" || if [[ $? -eq 126 || $? -eq 127 || $? -eq 64 ]]; then
ARGS="--silentlyFail true $ARGS"
run_openproj || if [[ $? -eq 126 || $? -eq 127 || $? -eq 64 ]]; then
#126 command invoked cannot execute #126 command invoked cannot execute
#127 command not found #127 command not found
#64 bad java version/impl #64 bad java version/impl
@ -191,7 +188,6 @@ if [ -f "$RUN_CONF" ]; then
#auto-detection will be performed #auto-detection will be performed
fi fi
fi fi
ARGS="$ARGS0"
fi fi
if [ "$JAVA_OK" -eq "0" ]; then if [ "$JAVA_OK" -eq "0" ]; then
@ -307,13 +303,13 @@ if [ "$JAVA_OK" -eq "0" ]; then
fi fi
if [ "$JAVA_OK" -eq "1" ]; then if [ "$JAVA_OK" -eq "1" ]; then
run_openproj run_openproj "$@"
else else
if [ "x$FIRST_JAVA_WITH_CORRECT_VERSION" != "x" ]; then if [ "x$FIRST_JAVA_WITH_CORRECT_VERSION" != "x" ]; then
echo "Trying $FIRST_JAVA_WITH_CORRECT_VERSION ..." echo "Trying $FIRST_JAVA_WITH_CORRECT_VERSION ..."
JAVA_EXE="$FIRST_JAVA_WITH_CORRECT_VERSION" JAVA_EXE="$FIRST_JAVA_WITH_CORRECT_VERSION"
create_run_conf create_run_conf
run_openproj run_openproj "$@"
echo $? echo $?
fi fi
fi fi