Refactor jri priority to vars

JakubVanek · JakubVanek · commit be2414a4e85b · 2018-04-21T16:46:59.000+02:00
diff --git a/modules/java.sh b/modules/java.sh
@@ -19,7 +19,7 @@ function java_install_bundle() {
     echo "Java package acquired, installing..."
     tar -xf "$JRI_ZIP" -C "$JRI_OPT"
     mv "$JRI_PATH_ZIP" "$JRI_PATH_NEW"
-    update-alternatives --install /usr/bin/java java "$JRI_EXE" 10
+    update-alternatives --install /usr/bin/java java "$JRI_EXE" "$JRI_PRIORITY"
 
     JAVA_REAL_EXE="$JRI_EXE"
 }
diff --git a/modules/vars.sh b/modules/vars.sh
@@ -7,6 +7,7 @@ JRI_ZIP="/home/robot/installer/jri10-ev3.tar.gz"
 JRI_PATH_ZIP="$JRI_OPT/jri-ev3/"
 JRI_PATH_NEW="$JRI_OPT/jri-10-build-050"
 JRI_EXE="$JRI_PATH_NEW/bin/java"
+JRI_PRIORITY="10"
 
 # brickpi java repository
 JDEB_REPO="deb http://ftp.debian.org/debian buster main contrib non-free"

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ function java_install_bundle() {`
`19`	`19`	`echo "Java package acquired, installing..."`
`20`	`20`	`tar -xf "$JRI_ZIP" -C "$JRI_OPT"`
`21`	`21`	`mv "$JRI_PATH_ZIP" "$JRI_PATH_NEW"`
`22`		`- update-alternatives --install /usr/bin/java java "$JRI_EXE" 10`
	`22`	`+ update-alternatives --install /usr/bin/java java "$JRI_EXE" "$JRI_PRIORITY"`
`23`	`23`
`24`	`24`	`JAVA_REAL_EXE="$JRI_EXE"`
`25`	`25`	`}`