From 8fced87f345033def8527e0b2284170795ebad19 Mon Sep 17 00:00:00 2001
From: Jephte Clain <Jephte.Clain@univ-reunion.fr>
Date: Tue, 7 Jun 2016 09:26:00 +0400
Subject: [PATCH] =?UTF-8?q?woctl=20run:=20permettre=20de=20choisir=20la=20?=
 =?UTF-8?q?version=20de=20java=20utilis=C3=A9e=20pour=20le=20lancement?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 woctl | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/woctl b/woctl
index d5dd5f8..1ec9e9f 100755
--- a/woctl
+++ b/woctl
@@ -726,6 +726,9 @@ OPTIONS
         Implique -o"
     }
 
+    DEFAULT_JDKVER=1.5
+
+    jdkver=
     debug=true
     sqldebug=false
     directconnect=false
@@ -736,6 +739,11 @@ OPTIONS
     directaction=
     parse_opts "${PRETTYOPTS[@]}" \
         --help '$exit_with __display_help' \
+        --1.5 jdkver=1.5 \
+        --1.6 jdkver=1.6 \
+        --1.7 jdkver=1.7 \
+        --1.8 jdkver=1.8 \
+        --jdkver: jdkver= \
         -D:: '$set@ debug true' \
         -S:: '$set@ sqldebug true' \
         -d:: '$set@ directconnect true' \
@@ -779,7 +787,8 @@ OPTIONS
     fi
 
     urequire java
-    select_java 1.5 || die "Impossible de trouver une version de java 1.5"
+    [ -n "$jdkver" ] || jdkver="$DEFAULT_JDKVER"
+    select_java "$jdkver" || die "Impossible de trouver une version de java $jdkver"
 
     if [ -n "$remotedebug" ]; then
         enote "L'application peut être débuggée en mode remote sur le port $remotedebug_port"