This repository was archived by the owner on Dec 2, 2020. It is now read-only.
File tree Expand file tree Collapse file tree 2 files changed +6
-2
lines changed Expand file tree Collapse file tree 2 files changed +6
-2
lines changed Original file line number Diff line number Diff line change 1616 java_jre = "/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java"
1717 next unless File . exist? java_jre
1818 t_java_jre = Facter ::Util ::Resolution . exec ( "'#{ java_jre } ' -version 2>&1" )
19- java_jre_version = t_java_jre . to_s . lines . first . strip . split ( /version/ ) [ 1 ] . gsub ( /"/ , "" ) . strip
19+ next unless t_java_jre_line = t_java_jre . to_s . lines . first
20+ next unless t_java_jre_version_section = t_java_jre_line . strip . split ( /version/ ) [ 1 ]
21+ java_jre_version = t_java_jre_version_section . gsub ( /"/ , "" ) . strip
2022 end
2123end
Original file line number Diff line number Diff line change 1616 # This will fail on OS X when Java hasn't been installed yet.
1717 next unless system "/usr/libexec/java_home --failfast &>/dev/null"
1818 t_java = Facter ::Util ::Resolution . exec ( "java -version 2>&1" )
19- java_version = t_java . to_s . lines . first . strip . split ( /version/ ) [ 1 ] . gsub ( /"/ , "" ) . strip
19+ next unless t_java_line = t_java . to_s . lines . first . to_s
20+ next unless t_java_version_section = t_java_line . strip . split ( /version/ ) [ 1 ]
21+ java_version = t_java_version_section . gsub ( /"/ , "" ) . strip
2022 end
2123end
You can’t perform that action at this time.
0 commit comments