浏览代码

Fixed a bug with Java8's installation

* sed was choking on the slashes given that $J7_HOME expands
  to also have slashes, so I changed this to pipe delimiters.
* JAVA_HOME was never set, but used when setting the PATH
  in java8.installed.
msmith-techempower 10 年之前
父节点
当前提交
4571c04c16
共有 1 个文件被更改,包括 4 次插入3 次删除
  1. 4 3
      toolset/setup/linux/languages/java8.sh

+ 4 - 3
toolset/setup/linux/languages/java8.sh

@@ -17,7 +17,7 @@ sudo update-alternatives --set java $J7_HOME/jre/bin/java
 sudo update-alternatives --set javac $J7_HOME/bin/javac
 
 # try to make sure all JDK binaries default to OpenJDK 7, not Java 8
-update-alternatives --get-selections | grep java-8 | sed -e "s/java-8-oracle/$J7_HOME/" | while read line
+update-alternatives --get-selections | grep java-8 | sed -e "s|java-8-oracle|$J7_HOME|" | while read line
 do
   l=(${line// / })
   n=${l[0]}
@@ -28,5 +28,6 @@ do
 done
 
 # Setup environment variables
-echo "export JAVA_HOME=/usr/lib/jvm/java-8-oracle" > $IROOT/java8.installed
-echo "export PATH=$JAVA_HOME/bin:$PATH" >> $IROOT/java8.installed
+JAVA_HOME=/usr/lib/jvm/java-8-oracle
+echo "export JAVA_HOME=${JAVA_HOME}" > $IROOT/java8.installed
+echo "export PATH=${JAVA_HOME}/bin:$PATH" >> $IROOT/java8.installed