From 504dfb8e7f9841011d43e164e30edc6cdbf80832 Mon Sep 17 00:00:00 2001
From: Dominik <pdominik@live.at>
Date: Thu, 25 Oct 2018 13:30:06 +0200
Subject: [PATCH] Force iDRAC 5

---
 startapp.sh | 32 ++++++++++----------------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/startapp.sh b/startapp.sh
index 58e6e5c..a7932a5 100644
--- a/startapp.sh
+++ b/startapp.sh
@@ -50,32 +50,20 @@ mkdir lib
 
 touch cookies
 
-if ( curl -k -y 1 --head https://${IDRAC_HOST}/page/login.html | grep '200 OK' > /dev/null ); then
-  IDRAC_VERSION=5
-  echo "iDRAC version 5 detected"
-  COOKIE=$(curl -k --data "WEBVAR_USERNAME=${IDRAC_USER}&WEBVAR_PASSWORD=${IDRAC_PASSWORD}" https://${IDRAC_HOST}/rpc/WEBSES/create.asp 2> /dev/null | grep SESSION_COOKIE | cut -d\' -f 4)
-  echo "Cookie=SessionCookie=${COOKIE}" > cookies
+IDRAC_VERSION=5
+echo "iDRAC version 5 detected"
+COOKIE=$(curl -k --data "WEBVAR_USERNAME=${IDRAC_USER}&WEBVAR_PASSWORD=${IDRAC_PASSWORD}" https://${IDRAC_HOST}/rpc/WEBSES/create.asp 2> /dev/null | grep SESSION_COOKIE | cut -d\' -f 4)
+echo "Cookie=SessionCookie=${COOKIE}" > cookies
 
-  echo "Downloading required files"
+echo "Downloading required files"
 
-  download JViewer.jar .
+download JViewer.jar .
 #  download Win64.jar lib
 #  download Win32.jar lib
-  download Linux_x86_32.jar lib
-  download Linux_x86_64.jar lib
+download Linux_x86_32.jar lib
+download Linux_x86_64.jar lib
 #  download Mac32.jar lib
 
-  args=$(curl -k --cookie Cookie=SessionCookie=${COOKIE} https://${IDRAC_HOST}/Java/jviewer.jnlp | awk -F '[<>]' '/argument/ { print $3 }')
+args=$(curl -k --cookie Cookie=SessionCookie=${COOKIE} https://${IDRAC_HOST}/Java/jviewer.jnlp | awk -F '[<>]' '/argument/ { print $3 }')
 
-  exec java -Djava.library.path="lib" -jar JViewer.jar $args
-elif ( curl -k -y 1 --head https://${IDRAC_HOST}/images/Ttl_2_iDRAC6_Ent_ML.png | grep '200 OK' > /dev/null ); then
-  IDRAC_VERSION=6
-  echo "iDRAC version 6 detected"
-  echo "Downloading required files"
-
-  download avctKVM.jar .
-  download avctKVMIOLinux64.jar lib
-  download avctVMLinux64.jar lib
-
-  exec java -cp avctKVM.jar -Djava.library.path="lib" com.avocent.idrac.kvm.Main ip=${IDRAC_HOST} kmport=5900 vport=5900 user=${IDRAC_USER} passwd=${IDRAC_PASSWORD} apcp=1 version=2 vmprivilege=true "helpurl=https://${IDRAC_HOST}:443/help/contents.html"
-fi
+exec java -Djava.library.path="lib" -jar JViewer.jar $args