make the inspect scripts posix compliant so that its possible to run them on busybox and alpine images. (#274)

Author: ddsharpe

imagetool/src/main/resources/probe-env/inspect-image-long.sh

@@ -1,58 +1,56 @@
-#!/usr/bin/env bash
+#!/bin/sh
 #
 #Copyright (c) 2021, Oracle and/or its affiliates.
 #
 #Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
-for token in $(java -version 2>&1)
-do
-  if [[ $token =~ \"([[:digit:]])\.([[:digit:]])\.(.*)\" ]]
-  then
-    echo javaVersion="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.${BASH_REMATCH[3]}"
-  fi
-done
+if [ "$(type -p java)" ]; then
+  echo javaVersion="$(java -version 2>&1 | awk -F '\"' '/version/ {print $2}')"
+fi
 
-if command -v dnf &> /dev/null; then
+if [ "$(type -p dnf)" ]; then
   echo packageManager=dnf
-elif command -v yum &> /dev/null; then
+elif [ "$(type -p yum)" ]; then
   echo packageManager=yum
-elif command -v microdnf &> /dev/null; then
+elif [ "$(type -p microdnf)" ]; then
   echo packageManager=microdnf
-elif command -v apt-get &> /dev/null; then
+elif [ "$(type -p apt-get)" ]; then
   echo packageManager=aptget
-elif command -v apk &> /dev/null; then
+elif [ "$(type -p apk)" ]; then
   echo packageManager=apk
-elif command -v zypper &> /dev/null; then
+elif [ "$(type -p zypper)" ]; then
   echo packageManager=zypper
 fi
 
-if [[ -n "$JAVA_HOME" ]]; then
+if [ -n "$JAVA_HOME" ]; then
   echo javaHome="$JAVA_HOME"
 fi
 
-if [[ -n "$ORACLE_HOME" ]]; then
+if [ -n "$DOMAIN_HOME" ]; then
+  echo domainHome="$DOMAIN_HOME"
+  if [ ! -d "$DOMAIN_HOME" ] || [ -z "$(ls -A $DOMAIN_HOME)" ]; then
+    echo wdtModelOnly=true
+  fi
+fi
+
+if [ -n "$WDT_MODEL_HOME" ]; then
+  echo wdtModelHome="$WDT_MODEL_HOME"
+fi
+
+
+if [ -n "$ORACLE_HOME" ]; then
   echo oracleHome="$ORACLE_HOME"
   WLS_TYPE=$(cat "$ORACLE_HOME"/inventory/registry.xml 2> /dev/null | grep -q 'WebLogic Server for FMW' && printf "fmw")
-  if [[ -n "$WLS_TYPE" ]]; then
+  if [ -n "$WLS_TYPE" ]; then
     echo wlsType="$WLS_TYPE"
   fi
-  if [[ -n "$JAVA_HOME" ]]; then
+  if [ -n "$JAVA_HOME" ]; then
     echo wlsVersion="$("$JAVA_HOME"/bin/java -cp "$ORACLE_HOME"/wlserver/server/lib/weblogic.jar weblogic.version 2> /dev/null | grep -oE -m 1 '([[:digit:]\.]+)' | head -1)"
   fi
+
   echo oracleHomeUser="$(stat -c '%U' "$ORACLE_HOME")"
   echo oracleHomeGroup="$(stat -c '%G' "$ORACLE_HOME")"
 
-  echo opatchVersion="$("$ORACLE_HOME"/OPatch/opatch version 2> /dev/null | grep -oE -m 1 '([[:digit:]\.]+)')"
-  echo oraclePatches=$("$ORACLE_HOME"/OPatch/opatch lspatches | awk -F";" '/^[0-9]/ {print $0";"}')
-fi
-
-if [[ -n "$DOMAIN_HOME" ]]; then
-  echo domainHome="$DOMAIN_HOME"
-  if [[ ! -d "$DOMAIN_HOME" ]] || [[ -z "$(ls -A $DOMAIN_HOME)" ]]; then
-    echo wdtModelOnly=true
-  fi
-fi
-
-if [[ -n "$WDT_MODEL_HOME" ]]; then
-  echo wdtModelHome="$WDT_MODEL_HOME"
+  echo opatchVersion="$($ORACLE_HOME/OPatch/opatch version 2> /dev/null | grep -oE -m 1 '([[:digit:]\.]+)')"
+  echo oraclePatches="$($ORACLE_HOME/OPatch/opatch lspatches | awk -F";" '/^[0-9]/ {print $0";"}')"
 fi

imagetool/src/main/resources/probe-env/inspect-image.sh

@@ -1,56 +1,53 @@
-#!/usr/bin/env bash
+#!/bin/sh
 #
 #Copyright (c) 2021, Oracle and/or its affiliates.
 #
 #Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
-for token in $(java -version 2>&1)
-do
-  if [[ $token =~ \"([[:digit:]])\.([[:digit:]])\.(.*)\" ]]
-  then
-    echo javaVersion="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.${BASH_REMATCH[3]}"
-  fi
-done
+if [ "$(type -p java)" ]; then
+  echo javaVersion="$(java -version 2>&1 | awk -F '\"' '/version/ {print $2}')"
+fi
 
-if command -v dnf &> /dev/null; then
+if [ "$(type -p dnf)" ]; then
   echo packageManager=dnf
-elif command -v yum &> /dev/null; then
+elif [ "$(type -p yum)" ]; then
   echo packageManager=yum
-elif command -v microdnf &> /dev/null; then
+elif [ "$(type -p microdnf)" ]; then
   echo packageManager=microdnf
-elif command -v apt-get &> /dev/null; then
+elif [ "$(type -p apt-get)" ]; then
   echo packageManager=aptget
-elif command -v apk &> /dev/null; then
+elif [ "$(type -p apk)" ]; then
   echo packageManager=apk
-elif command -v zypper &> /dev/null; then
+elif [ "$(type -p zypper)" ]; then
   echo packageManager=zypper
 fi
 
-if [[ -n "$JAVA_HOME" ]]; then
+if [ -n "$JAVA_HOME" ]; then
   echo javaHome="$JAVA_HOME"
 fi
 
-if [[ -n "$ORACLE_HOME" ]]; then
+if [ -n "$DOMAIN_HOME" ]; then
+  echo domainHome="$DOMAIN_HOME"
+  if [ ! -d "$DOMAIN_HOME" ] || [ -z "$(ls -A $DOMAIN_HOME)" ]; then
+    echo wdtModelOnly=true
+  fi
+fi
+
+if [ -n "$WDT_MODEL_HOME" ]; then
+  echo wdtModelHome="$WDT_MODEL_HOME"
+fi
+
+
+if [ -n "$ORACLE_HOME" ]; then
   echo oracleHome="$ORACLE_HOME"
   WLS_TYPE=$(cat "$ORACLE_HOME"/inventory/registry.xml 2> /dev/null | grep -q 'WebLogic Server for FMW' && printf "fmw")
-  if [[ -n "$WLS_TYPE" ]]; then
+  if [ -n "$WLS_TYPE" ]; then
     echo wlsType="$WLS_TYPE"
   fi
-  if [[ -n "$JAVA_HOME" ]]; then
+  if [ -n "$JAVA_HOME" ]; then
     echo wlsVersion="$("$JAVA_HOME"/bin/java -cp "$ORACLE_HOME"/wlserver/server/lib/weblogic.jar weblogic.version 2> /dev/null | grep -oE -m 1 '([[:digit:]\.]+)' | head -1)"
   fi
 
   echo oracleHomeUser="$(stat -c '%U' "$ORACLE_HOME")"
   echo oracleHomeGroup="$(stat -c '%G' "$ORACLE_HOME")"
 fi
-
-if [[ -n "$DOMAIN_HOME" ]]; then
-  echo domainHome="$DOMAIN_HOME"
-  if [[ ! -d "$DOMAIN_HOME" ]] || [[ -z "$(ls -A $DOMAIN_HOME)" ]]; then
-    echo wdtModelOnly=true
-  fi
-fi
-
-if [[ -n "$WDT_MODEL_HOME" ]]; then
-  echo wdtModelHome="$WDT_MODEL_HOME"
-fi