fix script errors

Signed-off-by: Corey Hemminger <hemminger@hotmail.com>

Author: Stromweld

lib/mixlib/install/generator/bourne/scripts/fetch_metadata.sh.erb

@@ -57,7 +57,7 @@ normalize_platform_name() {
   esac
 }
 
-if [ -n "$download_url_override" ]; then
+if [ -z "$download_url_override" ]; then
   echo "Getting information for $project $channel $version for $platform..."
 
   metadata_filename="$tmp_dir/metadata.txt"
@@ -94,7 +94,7 @@ if [ -n "$download_url_override" ]; then
       metadata_url="$base_api_url/$channel/$project/metadata?license_id=$license_id&v=$version&p=$platform&pv=$platform_version&m=$machine"
     fi
   else
-    # Omnitruck URL parameters
+    # Omnitruck URL parameters without license_id
     metadata_url="$base_api_url/$channel/$project/metadata?v=$version&p=$platform&pv=$platform_version&m=$machine"
   fi
 

lib/mixlib/install/generator/bourne/scripts/helpers.sh.erb

@@ -250,8 +250,8 @@ do_download() {
   echo "  to file $2"
 
   url=`echo $1`
-  if [ "x$platform" = "xsolaris2" ]; then
-    if [ "x$platform_version" = "x5.9" ] || [ "x$platform_version" = "x5.10" ]; then
+  if [ "$platform" = "solaris2" ]; then
+    if [ "$platform_version" = "5.9" ] || [ "$platform_version" = "5.10" ]; then
       # solaris 9 lacks openssl, solaris 10 lacks recent enough credentials - your base O/S is completely insecure, please upgrade
       url=`echo $url | sed -e 's/https/http/'`
     fi
@@ -289,7 +289,7 @@ install_file() {
   echo "Installing $project $version"
   case "$1" in
     "rpm")
-      if [ "x$platform" = "xnexus" ] || [ "x$platform" = "xios_xr" ]; then
+      if [ "$platform" = "nexus" ] || [ "$platform" = "ios_xr" ]; then
         echo "installing with yum..."
         yum install -yv "$2"
       else
@@ -345,10 +345,10 @@ install_file() {
   fi
 }
 
-if [ -n "$TMPDIR" ]; then
-  tmp=$TMPDIR
-else
+if [ -z "$TMPDIR" ]; then
   tmp="/tmp"
+else
+  tmp=$TMPDIR
 fi
 # secure-ish temp dir creation without having mktemp available (DDoS-able but not exploitable)
 tmp_dir="$tmp/install.sh.$$"

lib/mixlib/install/generator/bourne/scripts/install_package.sh

@@ -8,7 +8,7 @@
 # $version: The version requested. Used only for warning user if not set.
 ############
 
-if [ "x$version" = "x" ] && [ "x$CI" != "xtrue" ]; then
+if [ -z "$version" ] && [ "$CI" != "true" ]; then
   echo
   echo "WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING"
   echo

lib/mixlib/install/generator/bourne/scripts/platform_detection.sh

@@ -110,31 +110,31 @@ elif [ -f "/etc/SuSE-release" ]; then
       platform="opensuseleap"
       platform_version=`awk '/^VERSION =/ { print $3 }' /etc/SuSE-release`
   fi
-elif [ "x$os" = "xFreeBSD" ]; then
+elif [ "$os" = "FreeBSD" ]; then
   platform="freebsd"
   platform_version=`uname -r | sed 's/-.*//'`
-elif [ "x$os" = "xAIX" ]; then
+elif [ "$os" = "AIX" ]; then
   platform="aix"
   platform_version="`uname -v`.`uname -r`"
   machine="powerpc"
 elif [ -f "/etc/os-release" ]; then
   . /etc/os-release
-  if [ "x$CISCO_RELEASE_INFO" != "x" ]; then
+  if [ -n "$CISCO_RELEASE_INFO" ]; then
     . $CISCO_RELEASE_INFO
   fi
 
   platform=$ID
 
   # VERSION_ID is always the preferred variable to use, but not
   # every distro has it so fallback to VERSION
-  if [ "x$VERSION_ID" != "x" ]; then
+  if [ -n "$VERSION_ID" ]; then
     platform_version=$VERSION_ID
   else
     platform_version=$VERSION
   fi
 fi
 
-if [ "x$platform" = "x" ]; then
+if [ -z "$platform" ]; then
   echo "Unable to determine platform version!"
   report_bug
   exit 1
@@ -194,7 +194,7 @@ case $machine in
     ;;
 esac
 
-if [ -n "$platform_version" ]; then
+if [ -z "$platform_version" ]; then
   echo "Unable to determine platform version!"
   report_bug
   exit 1