Fixed JAVA_HOME

1 files changed, 8 insertions, 8 deletions

diff --git a/base-install.sh b/base-install.sh
index 13d0dd3..524283a 100644
--- a/base-install.sh
+++ b/base-install.sh
@@ -35,9 +35,9 @@ echo "Base Packages:"
 pack_arr=""
 for p in $packs; do
   if $DPKG -s "$p" >/dev/null 2>&1; then
-     printf "%25s%15s\n" "'$p'" "Y"
+     printf "%50s%30s\n" "'$p'" "Y"
   else
-     printf "%25s%15s\n" "'$p'" "N"
+     printf "%50s%30s\n" "'$p'" "N"
     pack_arr="$pack_arr $p"
   fi
 done
@@ -51,9 +51,9 @@ fi
 
 for p in $pack_arr; do
   if [ -n "`$APT_CACHE search $p`" ] ; then
-     printf "%25s%15s\n" "'$p'" "Y"
+     printf "%50s%30s\n" "'$p'" "Y"
   else
-    printf "%25s%15s\n" "'$p'" "N"
+    printf "%50s%30s\n" "'$p'" "N"
     pack_fail="$pack_fail $p"
   fi
 done
@@ -77,13 +77,13 @@ done
 
 if [ ! -f $JAVA_CONF ]; then
 
-  if [ ! -d "$JAVA_HOME" ]; then
-    echo "Directory '$JAVA_HOME' does not exist! Aborting..."
+  if [ ! -d "$OT_JAVA_HOME" ]; then
+    echo "Directory '$OT_JAVA_HOME' does not exist! Aborting..."
     exit 1
   fi
 
-  echo "if echo \"\$JAVA_HOME\" | grep -v \"$JAVA_HOME\">/dev/null 2>&1; then export JAVA_HOME=\"$JAVA_HOME\"; fi" >> "$JAVA_CONF"
-  echo "if echo \"\$PATH\" | grep -v \"$JAVA_HOME\"; then export PATH=\"$JAVA_HOME:\$PATH\"; fi" >> "$JAVA_CONF"
+  echo "if echo \"\$JAVA_HOME\" | grep -v \"$OT_JAVA_HOME\">/dev/null 2>&1; then export JAVA_HOME=\"$OT_JAVA_HOME\"; fi" >> "$JAVA_CONF"
+  echo "if echo \"\$PATH\" | grep -v \"$OT_JAVA_HOME\"; then export PATH=\"$OT_JAVA_HOME:\$PATH\"; fi" >> "$JAVA_CONF"
 
   echo "Java configuration has been stored in '$JAVA_CONF'."
   if ! grep "$JAVA_CONF" $OT_UI_CONF >/dev/null 2>&1; then