java, $jdk changed in pwrp_profile

src/tools/pkg/deb/pwr/pwrp_profile

@@ -31,12 +31,12 @@ export pwrp_db=$pwrp_root/common/db
 export pwrp_web=$web_dir
 
 export pwra_db=/usr/pwrp/adm/db
-jdk=`eval ls -t /usr/local | grep -m 1 ^jdk`
+jdk=`eval ls -t /usr/lib/jvm | grep -m 1 -e ^java-[0-9]*-openjdk`
 if [ -z "$jdk" ]; then
-  jdk=`eval ls -t /usr/local | grep -m 1 ^jre`
+  jdk=`eval ls -t /usr/lib/jvm | grep -m 1 jre`
 fi
 
-export jdk=/usr/local/$jdk
+export jdk=/usr/lib/jvm/$jdk
 export jdk_home=$jdk/bin
 PATH=$PATH:$pwr_exe:$pwrp_exe:$jdk_home
 

src/tools/pkg/deb/pwrrt/pwrp_profile

@@ -31,12 +31,12 @@ export pwrp_db=$pwrp_root/common/db
 export pwrp_web=$web_dir
 
 export pwra_db=/usr/pwrp/adm/db
-jdk=`eval ls -t /usr/local | grep -m 1 ^jdk`
+jdk=`eval ls -t /usr/lib/jvm | grep -m 1 -e ^java-[0-9]*-openjdk`
 if [ -z "$jdk" ]; then
-  jdk=`eval ls -t /usr/local | grep -m 1 ^jre`
+  jdk=`eval ls -t /usr/lib/jvm | grep -m 1 jre`
 fi
 
-export jdk=/usr/local/$jdk
+export jdk=/usr/lib/jvm/$jdk
 export jdk_home=$jdk/bin
 PATH=$PATH:$pwr_exe:$pwrp_exe:$jdk_home
 

src/tools/pkg/deb/pwrsev/pwrp_profile

@@ -31,8 +31,13 @@ export pwrp_db=$pwrp_root/common/db
 export pwrp_web=$web_dir
 
 export pwra_db=/usr/pwrp/adm/db
-jdk=`eval ls /usr/local | grep ^jre`
-export jdk_home=/usr/local/$jdk/bin
+jdk=`eval ls -t /usr/lib/jvm | grep -m 1 -e ^java-[0-9]*-openjdk`
+if [ -z "$jdk" ]; then
+  jdk=`eval ls -t /usr/lib/jvm | grep -m 1 jre`
+fi
+
+export jdk=/usr/lib/jvm/$jdk
+export jdk_home=$jdk/bin
 PATH=$PATH:$pwr_exe:$pwrp_exe:$jdk_home
 
 #Set display to remote computer

src/tools/pkg/deb_x86_64/pwr/pwrp_profile

@@ -31,12 +31,12 @@ export pwrp_db=$pwrp_root/common/db
 export pwrp_web=$web_dir
 
 export pwra_db=/usr/pwrp/adm/db
-jdk=`eval ls -t /usr/local | grep -m 1 ^jdk`
+jdk=`eval ls -t /usr/lib/jvm | grep -m 1 -e ^java-[0-9]*-openjdk`
 if [ -z "$jdk" ]; then
-  jdk=`eval ls -t /usr/local | grep -m 1 ^jre`
+  jdk=`eval ls -t /usr/lib/jvm | grep -m 1 jre`
 fi
 
-export jdk=/usr/local/$jdk
+export jdk=/usr/lib/jvm/$jdk
 export jdk_home=$jdk/bin
 PATH=$PATH:$pwr_exe:$pwrp_exe:$jdk_home
 

src/tools/pkg/deb_x86_64/pwrrt/pwrp_profile

@@ -31,12 +31,12 @@ export pwrp_db=$pwrp_root/common/db
 export pwrp_web=$web_dir
 
 export pwra_db=/usr/pwrp/adm/db
-jdk=`eval ls -t /usr/local | grep -m 1 ^jdk`
+jdk=`eval ls -t /usr/lib/jvm | grep -m 1 -e ^java-[0-9]*-openjdk`
 if [ -z "$jdk" ]; then
-  jdk=`eval ls -t /usr/local | grep -m 1 ^jre`
+  jdk=`eval ls -t /usr/lib/jvm | grep -m 1 jre`
 fi
 
-export jdk=/usr/local/$jdk
+export jdk=/usr/lib/jvm/$jdk
 export jdk_home=$jdk/bin
 PATH=$PATH:$pwr_exe:$pwrp_exe:$jdk_home
 

src/tools/pkg/deb_x86_64/pwrsev/pwrp_profile

@@ -31,8 +31,13 @@ export pwrp_db=$pwrp_root/common/db
 export pwrp_web=$web_dir
 
 export pwra_db=/usr/pwrp/adm/db
-jdk=`eval ls /usr/local | grep ^jre`
-export jdk_home=/usr/local/$jdk/bin
+jdk=`eval ls -t /usr/lib/jvm | grep -m 1 -e ^java-[0-9]*-openjdk`
+if [ -z "$jdk" ]; then
+  jdk=`eval ls -t /usr/lib/jvm | grep -m 1 jre`
+fi
+
+export jdk=/usr/lib/jvm/$jdk
+export jdk_home=$jdk/bin
 PATH=$PATH:$pwr_exe:$pwrp_exe:$jdk_home
 
 #Set display to remote computer

src/tools/pkg/raspbian/pwr/pwrp_profile

@@ -31,12 +31,12 @@ export pwrp_db=$pwrp_root/common/db
 export pwrp_web=$web_dir
 
 export pwra_db=/usr/pwrp/adm/db
-jdk=`eval ls -t /usr/local | grep -m 1 ^jdk`
+jdk=`eval ls -t /usr/lib/jvm | grep -m 1 -e ^java-[0-9]*-openjdk`
 if [ -z "$jdk" ]; then
-  jdk=`eval ls -t /usr/local | grep -m 1 ^jre`
+  jdk=`eval ls -t /usr/lib/jvm | grep -m 1 jre`
 fi
 
-export jdk=/usr/local/$jdk
+export jdk=/usr/lib/jvm/$jdk
 export jdk_home=$jdk/bin
 PATH=$PATH:$pwr_exe:$pwrp_exe:$jdk_home
 

src/tools/pkg/raspbian/pwrrt/pwrp_profile

@@ -31,12 +31,12 @@ export pwrp_db=$pwrp_root/common/db
 export pwrp_web=$web_dir
 
 export pwra_db=/usr/pwrp/adm/db
-jdk=`eval ls -t /usr/local | grep -m 1 ^jdk`
+jdk=`eval ls -t /usr/lib/jvm | grep -m 1 -e ^java-[0-9]*-openjdk`
 if [ -z "$jdk" ]; then
-  jdk=`eval ls -t /usr/local | grep -m 1 ^jre`
+  jdk=`eval ls -t /usr/lib/jvm | grep -m 1 jre`
 fi
 
-export jdk=/usr/local/$jdk
+export jdk=/usr/lib/jvm/$jdk
 export jdk_home=$jdk/bin
 PATH=$PATH:$pwr_exe:$pwrp_exe:$jdk_home
 

src/tools/pkg/raspbian/pwrsev/pwrp_profile

@@ -31,8 +31,13 @@ export pwrp_db=$pwrp_root/common/db
 export pwrp_web=$web_dir
 
 export pwra_db=/usr/pwrp/adm/db
-jdk=`eval ls /usr/local | grep ^jre`
-export jdk_home=/usr/local/$jdk/bin
+jdk=`eval ls -t /usr/lib/jvm | grep -m 1 -e ^java-[0-9]*-openjdk`
+if [ -z "$jdk" ]; then
+  jdk=`eval ls -t /usr/lib/jvm | grep -m 1 jre`
+fi
+
+export jdk=/usr/lib/jvm/$jdk
+export jdk_home=$jdk/bin
 PATH=$PATH:$pwr_exe:$pwrp_exe:$jdk_home
 
 #Set display to remote computer

src/tools/pkg/ubu/pwr/pwrp_profile

@@ -31,12 +31,12 @@ export pwrp_db=$pwrp_root/common/db
 export pwrp_web=$web_dir
 
 export pwra_db=/usr/pwrp/adm/db
-jdk=`eval ls -t /usr/local | grep -m 1 ^jdk`
+jdk=`eval ls -t /usr/lib/jvm | grep -m 1 -e ^java-[0-9]*-openjdk`
 if [ -z "$jdk" ]; then
-  jdk=`eval ls -t /usr/local | grep -m 1 ^jre`
+  jdk=`eval ls -t /usr/lib/jvm | grep -m 1 jre`
 fi
 
-export jdk=/usr/local/$jdk
+export jdk=/usr/lib/jvm/$jdk
 export jdk_home=$jdk/bin
 PATH=$PATH:$pwr_exe:$pwrp_exe:$jdk_home
 

src/tools/pkg/ubu/pwrrt/pwrp_profile

@@ -31,12 +31,12 @@ export pwrp_db=$pwrp_root/common/db
 export pwrp_web=$web_dir
 
 export pwra_db=/usr/pwrp/adm/db
-jdk=`eval ls -t /usr/local | grep -m 1 ^jdk`
+jdk=`eval ls -t /usr/lib/jvm | grep -m 1 -e ^java-[0-9]*-openjdk`
 if [ -z "$jdk" ]; then
-  jdk=`eval ls -t /usr/local | grep -m 1 ^jre`
+  jdk=`eval ls -t /usr/lib/jvm | grep -m 1 jre`
 fi
 
-export jdk=/usr/local/$jdk
+export jdk=/usr/lib/jvm/$jdk
 export jdk_home=$jdk/bin
 PATH=$PATH:$pwr_exe:$pwrp_exe:$jdk_home
 

src/tools/pkg/ubu/pwrsev/pwrp_profile

@@ -31,8 +31,13 @@ export pwrp_db=$pwrp_root/common/db
 export pwrp_web=$web_dir
 
 export pwra_db=/usr/pwrp/adm/db
-jdk=`eval ls /usr/local | grep ^jre`
-export jdk_home=/usr/local/$jdk/bin
+jdk=`eval ls -t /usr/lib/jvm | grep -m 1 -e ^java-[0-9]*-openjdk`
+if [ -z "$jdk" ]; then
+  jdk=`eval ls -t /usr/lib/jvm | grep -m 1 jre`
+fi
+
+export jdk=/usr/lib/jvm/$jdk
+export jdk_home=$jdk/bin
 PATH=$PATH:$pwr_exe:$pwrp_exe:$jdk_home
 
 #Set display to remote computer

src/tools/pkg/ubu_x86_64/pwr/pwrp_profile

@@ -31,12 +31,12 @@ export pwrp_db=$pwrp_root/common/db
 export pwrp_web=$web_dir
 
 export pwra_db=/usr/pwrp/adm/db
-jdk=`eval ls -t /usr/local | grep -m 1 ^jdk`
+jdk=`eval ls -t /usr/lib/jvm | grep -m 1 -e ^java-[0-9]*-openjdk`
 if [ -z "$jdk" ]; then
-  jdk=`eval ls -t /usr/local | grep -m 1 ^jre`
+  jdk=`eval ls -t /usr/lib/jvm | grep -m 1 jre`
 fi
 
-export jdk=/usr/local/$jdk
+export jdk=/usr/lib/jvm/$jdk
 export jdk_home=$jdk/bin
 PATH=$PATH:$pwr_exe:$pwrp_exe:$jdk_home
 

src/tools/pkg/ubu_x86_64/pwrrt/pwrp_profile

@@ -31,12 +31,12 @@ export pwrp_db=$pwrp_root/common/db
 export pwrp_web=$web_dir
 
 export pwra_db=/usr/pwrp/adm/db
-jdk=`eval ls -t /usr/local | grep -m 1 ^jdk`
+jdk=`eval ls -t /usr/lib/jvm | grep -m 1 -e ^java-[0-9]*-openjdk`
 if [ -z "$jdk" ]; then
-  jdk=`eval ls -t /usr/local | grep -m 1 ^jre`
+  jdk=`eval ls -t /usr/lib/jvm | grep -m 1 jre`
 fi
 
-export jdk=/usr/local/$jdk
+export jdk=/usr/lib/jvm/$jdk
 export jdk_home=$jdk/bin
 PATH=$PATH:$pwr_exe:$pwrp_exe:$jdk_home
 

src/tools/pkg/ubu_x86_64/pwrsev/pwrp_profile

@@ -31,8 +31,13 @@ export pwrp_db=$pwrp_root/common/db
 export pwrp_web=$web_dir
 
 export pwra_db=/usr/pwrp/adm/db
-jdk=`eval ls /usr/local | grep ^jre`
-export jdk_home=/usr/local/$jdk/bin
+jdk=`eval ls -t /usr/lib/jvm | grep -m 1 -e ^java-[0-9]*-openjdk`
+if [ -z "$jdk" ]; then
+  jdk=`eval ls -t /usr/lib/jvm | grep -m 1 jre`
+fi
+
+export jdk=/usr/lib/jvm/$jdk
+export jdk_home=$jdk/bin
 PATH=$PATH:$pwr_exe:$pwrp_exe:$jdk_home
 
 #Set display to remote computer