Update to 17.05.06.00

7 files changed, 345 insertions, 130 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2fb6e95eb41f..00be639251fa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,33 @@
 pkgbase = lsi-msm
 	pkgdesc = LSI Logic MegaRAID Storage Manager and SNMP providers
-	pkgver = 17.05.02.01
-	pkgrel = 3
+	pkgver = 17.05.06.00
+	pkgrel = 1
 	url = https://www.broadcom.com/products/storage
 	arch = x86_64
-	license = custom:LSI
+	license = custom:Broadcom
 	makedepends = setconf
+	noextract = javax.activation.jar
 	options = !strip
+	source = 17.05.06.00_MSM_Linux-x64.zip::https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/17.05.06.00_MSM_Linux-x64.zip
+	source = MegaRAID_SAS_Software_User_Guide-rev2.8.pdf::https://docs.broadcom.com/wcs-public/user-guide/products/design--reference-guides/user-guide/574/208/pub-005110_db15-001199-08_2017-06-09_mr-6.14-sw-ug.pdf
+	source = https://github.com/javaee/activation/releases/download/JAF-1_2_0/javax.activation.jar
 	source = msm_profile.sh
 	source = LSI_StorSNMP.ini
 	source = lsi_msm.service
 	source = lsi_mrdsnmpd.service
 	source = ld.so.lsi-msm.conf
 	source = ld.so.lsi-msm-snmp.conf
-	source = https://docs.broadcom.com/docs-and-downloads/advanced-software/advanced-software-common-files/SLA_AdvancedSoftware.pdf
-	source = MegaRAID_SAS_Software_User_Guide-rev2.8.pdf::https://docs.broadcom.com/wcs-public/user-guide/products/design--reference-guides/user-guide/574/208/pub-005110_db15-001199-08_2017-06-09_mr-6.14-sw-ug.pdf
-	source = 17.05.02.01_Linux-x64_MSM.zip::https://docs.broadcom.com/docs-and-downloads/docs-and-downloads/raid-controllers/raid-controllers-common-files/17.05.02.01_MSM_Linux-x64.zip
-	sha256sums = aff9c7ed8e55eb3441911183db1b0912cf74f24ce3027b3aebe3560db69d3a1d
+	source = tweak_scripts.diff
+	sha256sums = ae03719c3d23d779c20f24275bc24badfa8c1dfbdcc1b2d627e6847318cd6ef6
+	sha256sums = 5e56870338353877803225250607539d07da32c0b455461cfb9fbddc66e93519
+	sha256sums = 993302b16cd7056f21e779cc577d175a810bb4900ef73cd8fbf2b50f928ba9ce
+	sha256sums = ce37664bb64fa8f9d006409afc055f5bc3ffa990414b71e92ac009b500adb598
 	sha256sums = 605adcb662fb457609e81fb8916da7e88541e81dd0c112a8bb569d84df189bff
 	sha256sums = 207a40086b9d575cb49d4bdc906899c4f1fbcd861a3db6fb486a0d729053146a
 	sha256sums = cf4d28307f8629e9c94bed28bd1fffb09a894ad2b348973f39f2dfc74b23ee68
 	sha256sums = 9b1065325731a1711d6dce3ecbf2cccc6fbe524b60e0eb5c0f1fdba315222c95
-	sha256sums = 9b1065325731a1711d6dce3ecbf2cccc6fbe524b60e0eb5c0f1fdba315222c95
-	sha256sums = 9be6a8818ea1dccec65d48b86dd0cc62009dc3886229e3dce41192a241bd55c3
-	sha256sums = 5e56870338353877803225250607539d07da32c0b455461cfb9fbddc66e93519
-	sha256sums = 8f9e7c1a9468cfb95159e27d4df0978faf7e0e1303bf0ae6999a897d33a21414
+	sha256sums = 8cb82f51d634e5a819763a32168104d8d37de553de049dfbebb0c2aa83106f07
+	sha256sums = f4cdfa196d18221000cb461d02382e7595e896a6361a355ee534631e3734e2ed
 
 pkgname = lsi-msm
 	pkgdesc = LSI Logic MegaRAID Storage Manager
@@ -32,15 +35,8 @@ pkgname = lsi-msm
 	depends = lsi-openpegasus
 	depends = unixodbc
 	depends = xdg-utils
-	depends = java-environment=8
-	depends = libcrypt.so=1
-	depends = lib32-libxi
-	depends = lib32-libxft
-	depends = lib32-libpng12
-	depends = lib32-libxinerama
-	depends = lib32-libjpeg6-turbo
-	depends = lib32-libxxf86vm
-	depends = lib32-gcc-libs
+	depends = java-runtime=8
+	depends = sh
 	backup = usr/share/MegaRAID_Storage_Manager/debugschema.xsd
 	backup = usr/share/MegaRAID_Storage_Manager/debugcfg.xml
 	backup = usr/share/MegaRAID_Storage_Manager/msm.properties
@@ -59,6 +55,7 @@ pkgname = lsi-msm-snmp
 	depends = net-snmp
 	depends = perl-net-snmp
 	depends = perl-term-readkey
+	depends = sh
 	backup = etc/lsi_mrdsnmp/LSI_StorSNMP.ini
 	backup = etc/lsi_mrdsnmp/sas/sas_TrapDestination.conf
 	backup = etc/lsi_mrdsnmp/sas-ir/sas_ir_TrapDestination.conf
diff --git a/.gitignore b/.gitignore
index 04afa6bdb782..624bacf414b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 !msm_profile.sh
 !ld.so.lsi-msm.conf
 !ld.so.lsi-msm-snmp.conf
+!tweak_scripts.diff
diff --git a/PKGBUILD b/PKGBUILD
index d929d7bdd2f3..1122f49d2d85 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,34 +4,37 @@ pkgbase=lsi-msm
 pkgname=('lsi-msm'
          'lsi-msm-snmp'
          )
-_pkgver=17.05.02-01
+_pkgver=17.05.06-00
 pkgver="${_pkgver//-/.}"
-pkgrel=3
+pkgrel=1
 pkgdesc="LSI Logic MegaRAID Storage Manager and SNMP providers"
 arch=('x86_64')
 url='https://www.broadcom.com/products/storage'
-license=('custom:LSI')
+license=('custom:Broadcom')
 makedepends=('setconf')
-source=('msm_profile.sh'
+source=("${pkgver}_MSM_Linux-x64.zip::https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/${pkgver}_MSM_Linux-x64.zip"
+        'MegaRAID_SAS_Software_User_Guide-rev2.8.pdf::https://docs.broadcom.com/wcs-public/user-guide/products/design--reference-guides/user-guide/574/208/pub-005110_db15-001199-08_2017-06-09_mr-6.14-sw-ug.pdf'
+        'https://github.com/javaee/activation/releases/download/JAF-1_2_0/javax.activation.jar'
+        'msm_profile.sh'
         'LSI_StorSNMP.ini'
         'lsi_msm.service'
         'lsi_mrdsnmpd.service'
         'ld.so.lsi-msm.conf'
         'ld.so.lsi-msm-snmp.conf'
-        'https://docs.broadcom.com/docs-and-downloads/advanced-software/advanced-software-common-files/SLA_AdvancedSoftware.pdf'
-        'MegaRAID_SAS_Software_User_Guide-rev2.8.pdf::https://docs.broadcom.com/wcs-public/user-guide/products/design--reference-guides/user-guide/574/208/pub-005110_db15-001199-08_2017-06-09_mr-6.14-sw-ug.pdf'
-        "${pkgver}_Linux-x64_MSM.zip::https://docs.broadcom.com/docs-and-downloads/docs-and-downloads/raid-controllers/raid-controllers-common-files/${pkgver}_MSM_Linux-x64.zip"
+        'tweak_scripts.diff'
         )
-sha256sums=('aff9c7ed8e55eb3441911183db1b0912cf74f24ce3027b3aebe3560db69d3a1d'
+sha256sums=('ae03719c3d23d779c20f24275bc24badfa8c1dfbdcc1b2d627e6847318cd6ef6'
+            '5e56870338353877803225250607539d07da32c0b455461cfb9fbddc66e93519'
+            '993302b16cd7056f21e779cc577d175a810bb4900ef73cd8fbf2b50f928ba9ce'
+            'ce37664bb64fa8f9d006409afc055f5bc3ffa990414b71e92ac009b500adb598'
             '605adcb662fb457609e81fb8916da7e88541e81dd0c112a8bb569d84df189bff'
             '207a40086b9d575cb49d4bdc906899c4f1fbcd861a3db6fb486a0d729053146a'
             'cf4d28307f8629e9c94bed28bd1fffb09a894ad2b348973f39f2dfc74b23ee68'
             '9b1065325731a1711d6dce3ecbf2cccc6fbe524b60e0eb5c0f1fdba315222c95'
-            '9b1065325731a1711d6dce3ecbf2cccc6fbe524b60e0eb5c0f1fdba315222c95'
-            '9be6a8818ea1dccec65d48b86dd0cc62009dc3886229e3dce41192a241bd55c3'
-            '5e56870338353877803225250607539d07da32c0b455461cfb9fbddc66e93519'
-            '8f9e7c1a9468cfb95159e27d4df0978faf7e0e1303bf0ae6999a897d33a21414'
+            '8cb82f51d634e5a819763a32168104d8d37de553de049dfbebb0c2aa83106f07'
+            'f4cdfa196d18221000cb461d02382e7595e896a6361a355ee534631e3734e2ed'
             )
+noextract=('javax.activation.jar')
 options=('!strip')
 
 _create_links() {
@@ -53,16 +56,8 @@ package_lsi-msm() {
   depends=('lsi-openpegasus'
            'unixodbc'
            'xdg-utils'
-           'java-environment=8'
-           'libcrypt.so=1'
-           'lib32-libxi'
-           'lib32-libxft'
-           'lib32-libpng12'
-           'lib32-libxinerama'
-           'lib32-libjpeg6-turbo'
-           'lib32-libxxf86vm'
-           'lib32-gcc-libs'
-           # 'lib32-xerces-c'
+           'java-runtime=8'
+           'sh'
          )
   backup=('usr/share/MegaRAID_Storage_Manager/debugschema.xsd'
           'usr/share/MegaRAID_Storage_Manager/debugcfg.xml'
@@ -87,19 +82,10 @@ package_lsi-msm() {
   mv usr/local usr/share
   mv "usr/share/MegaRAID Storage Manager" usr/share/MegaRAID_Storage_Manager
 
-  # Setup shortcuts
-  install -Dm644 usr/share/MegaRAID_Storage_Manager/setdisp.png usr/share/pixmaps/setdisp.png
-  install -Dm644 usr/share/MegaRAID_Storage_Manager/MSMHelp.desktop.SuSE usr/share/applications/MSMHelp.desktop
-  install -Dm644 usr/share/MegaRAID_Storage_Manager/MSMStartupUI.desktop.SuSE usr/share/applications/MSMStartupUI.desktop
-  setconf usr/share/applications/MSM{Help,StartupUI}.desktop Categories System
-  setconf usr/share/applications/MSMHelp.desktop X-KDE-SubstituteUID false
-  setconf usr/share/applications/MSMHelp.desktop Exec "/usr/share/MegaRAID_Storage_Manager/starthelp.sh"
-  setconf usr/share/applications/MSMStartupUI.desktop Exec "/usr/share/MegaRAID_Storage_Manager/startupui.sh"
-
-  # Remove unused files
+  # Remove unused/leftover files
   rm -fr etc/init.d \
          usr/share/MegaRAID_Storage_Manager/setdisp.png.old \
-         usr/share/MegaRAID_Storage_Manager/*desktop.{SuSE,redhat} \
+         usr/share/MegaRAID_Storage_Manager/add_entry \
          usr/share/MegaRAID_Storage_Manager/{uninstaller,pwd,.__uninst}.sh \
          usr/share/MegaRAID_Storage_Manager/vmware{35,40} \
          usr/share/MegaRAID_Storage_Manager/jre \
@@ -114,65 +100,33 @@ package_lsi-msm() {
   # Fix permisions
   find . -type d -print0 2>/dev/null | xargs -0r chmod 755
   find . -type f -print0 2>/dev/null | xargs -0r chmod 644
-  for i in $(find . -type f -name '*.sh' -o -name 'popup_bin' -o -name 'popup' -o -name "add_entry" -o -name 'storcli*' -o -name 'mrmonitor' -o -name '*.so*'); do chmod +x ${i}; done
-
-  # Standarized /usr/share/MegaRAID_Storage_Manager/start{,monitor}help.sh whit xdg-open ## Someday, I'll create a patch instead sed
-  sed -e '13,20d' \
-      -e 's|mozilla|xdg-open|g' \
-      -e 's|/firefox||g' \
-      -i usr/share/MegaRAID_Storage_Manager/startmonitorhelp.sh
-  sed -e '28,35d' \
-      -e 's|mozilla|xdg-open|g' \
-      -e 's|/firefox||g' \
-      -i usr/share/MegaRAID_Storage_Manager/starthelp.sh
-
-  # Fix Java (use system java)
-  sed -e 's|../jre/bin|/usr/lib/jvm/java-8-openjdk/jre/bin|g' \
-      -e 's|../jre/lib|/usr/lib/jvm/java-8-openjdk/jre/lib|g' \
-      -i usr/share/MegaRAID_Storage_Manager/MegaPopup/popup \
-      -i usr/share/MegaRAID_Storage_Manager/MegaPopup/shutdownpopup.sh \
-      -i usr/share/MegaRAID_Storage_Manager/Framework/startup.sh \
-      -i usr/share/MegaRAID_Storage_Manager/Framework/shutdown.sh
-  sed -e 's|./jre/bin|/usr/lib/jvm/java-8-openjdk/jre/bin|g' \
-      -i usr/share/MegaRAID_Storage_Manager/startupui.sh
-
-  # Add missing #! in scripts
-  sed '1i#!/bin/sh' \
-      -i usr/share/MegaRAID_Storage_Manager/startupui.sh \
-      -i usr/share/MegaRAID_Storage_Manager/startmonitorhelp.sh \
-      -i usr/share/MegaRAID_Storage_Manager/Framework/startup.sh \
-      -i usr/share/MegaRAID_Storage_Manager/Framework/shutdown.sh
-
-  # Tweak scripts
-  sed -e 's|init.d/msm_profile|profile.d/msm.sh|g' \
-      -i usr/share/MegaRAID_Storage_Manager/start*.sh \
-      -i usr/share/MegaRAID_Storage_Manager/MegaPopup/popup \
-      -i usr/share/MegaRAID_Storage_Manager/MegaPopup/shutdownpopup.sh
-  sed -e '/^$/d' \
-      -e 's|path  |path \.:|g' \
-      -e 's|1> /dev/null 2> /dev/null|\&> /dev/null|g' \
-      -i usr/share/MegaRAID_Storage_Manager/MegaPopup/shutdownpopup.sh
-  sed '/^LD_LIBRARY_PATH/d' \
-      -i usr/share/MegaRAID_Storage_Manager/Framework/startup.sh
-  sed -e '/^$/d' \
-      -e '2,3d' \
-      -i usr/share/MegaRAID_Storage_Manager/Framework/shutdown.sh
-  sed -e '2i\. /etc/profile.d/msm.sh' \
-      -i usr/share/MegaRAID_Storage_Manager/Framework/startup.sh \
-      -i usr/share/MegaRAID_Storage_Manager/Framework/shutdown.sh
-  sed -e 's|^  \+|  |;s|^ \+|  |g' \
-      -e 's|\t|  |g' \
-      -e 's|     |  |g' \
-      -i usr/share/MegaRAID_Storage_Manager/start*.sh
-
-  # Set java home
+  for i in $(find . -type f -name '*.sh' -o -name 'popup' -o -name 'storcli*' -o -name '*.so*'); do chmod 755 ${i}; done
+
+  # Tweak scripts with tons of things:
+  # - Use system java 8
+  # - Use xdg-open instead of real browsers
+  # - Identation
+  # - Add missing #!
+  # - Run all with C locale (always en_EN)
+  # - etc.
+  patch -p1 -i "${srcdir}/tweak_scripts.diff"
+
+  # Create java bits
   mkdir -p  usr/share/MegaRAID_Storage_Manager/jre/.{userPrefs,systemPrefs}
-  sed -e 's|-classpath|-Djava.util.prefs.systemRoot="${MSM_HOME}"/jre -Djava.util.prefs.userRoot="${MSM_HOME}"/jre/.userPrefs -classpath|g' \
-      -i usr/share/MegaRAID_Storage_Manager/startupui.sh \
-      -i usr/share/MegaRAID_Storage_Manager/MegaPopup/popup \
-      -i usr/share/MegaRAID_Storage_Manager/MegaPopup/shutdownpopup.sh \
-      -i usr/share/MegaRAID_Storage_Manager/Framework/startup.sh \
-      -i usr/share/MegaRAID_Storage_Manager/Framework/shutdown.sh \
+
+  # Install javax.activation.jar
+  install -Dm644 "${srcdir}/javax.activation.jar" usr/share/MegaRAID_Storage_Manager/Framework/javax.activation.jar
+
+  # Setup shortcuts
+  install -Dm644 usr/share/MegaRAID_Storage_Manager/setdisp.png usr/share/pixmaps/setdisp.png
+  install -Dm644 usr/share/MegaRAID_Storage_Manager/MSMHelp.desktop.SuSE usr/share/applications/MSMHelp.desktop
+  install -Dm644 usr/share/MegaRAID_Storage_Manager/MSMStartupUI.desktop.SuSE usr/share/applications/MSMStartupUI.desktop
+  setconf usr/share/applications/MSM{Help,StartupUI}.desktop Categories System
+  setconf usr/share/applications/MSMHelp.desktop X-KDE-SubstituteUID false
+  setconf usr/share/applications/MSMHelp.desktop Exec "/usr/share/MegaRAID_Storage_Manager/starthelp.sh"
+  setconf usr/share/applications/MSMStartupUI.desktop Exec "/usr/share/MegaRAID_Storage_Manager/startupui.sh"
+  rm -fr usr/share/MegaRAID_Storage_Manager/*desktop.{SuSE,redhat}
+  rm -fr usr/share/MegaRAID_Storage_Manager/setdisp.png
 
   # Install services and other files
   install -Dm644 "${srcdir}/lsi_msm.service" usr/lib/systemd/system/lsi_msm.service
@@ -181,18 +135,15 @@ package_lsi-msm() {
   # Add /opt/lsi/msm/lib to ldconf search path
   install -Dm644 "${srcdir}/ld.so.lsi-msm.conf" etc/ld.so.conf.d/lsi-msm.conf
 
-  # Remove Megapopup system launcher. because eats tons of RAM and have missing dependencies
-  rm -fr etc/X11
-
-  # Install licenses
-  install -Dm644 "${srcdir}/SLA_AdvancedSoftware.pdf" "usr/share/licenses/${pkgname}/SLA_AdvancedSoftware.pdf"
+  # Install License
+  install -d "usr/share/licenses/${pkgname}/"
+  cat "${srcdir}/disk/install.csh" | sed -n '18,68p' | sed -e 's|echo "||g' -e 's|^"||g' -e 's| "$||g' -e 's|"$||g' > "usr/share/licenses/${pkgname}/LICENSE"
 
   # Install the manual
   install -Dm644 "${srcdir}/MegaRAID_SAS_Software_User_Guide-rev2.8.pdf" usr/share/doc/lsi-msm/MegaRAID_SAS_Software_User_Guide-rev2.8.pdf
 
   # Create soname links
   _create_links
-
 }
 
 package_lsi-msm-snmp() {
@@ -200,6 +151,7 @@ pkgdesc="LSI Logic MegaRAID Storage Manager Suite SNMP providers"
 depends=('net-snmp'
          'perl-net-snmp'
          'perl-term-readkey'
+         'sh'
          )
 backup=('etc/lsi_mrdsnmp/LSI_StorSNMP.ini'
         'etc/lsi_mrdsnmp/sas/sas_TrapDestination.conf'
@@ -237,10 +189,10 @@ install=lsi-msm-snmp.install
   # Add /opt/lsi/snmp/lib to ldconf search path
   install -Dm644 "${srcdir}/ld.so.lsi-msm-snmp.conf" etc/ld.so.conf.d/lsi-msm-snmp.conf
 
-  # Install licenses
-  install -Dm644 "${srcdir}/SLA_AdvancedSoftware.pdf" "usr/share/licenses/${pkgname}/SLA_AdvancedSoftware.pdf"
+  # Install license
+  install -d "usr/share/licenses/${pkgname}"
+  cat "${srcdir}/disk/install.csh" | sed -n '18,68p' | sed -e 's|echo "||g' -e 's|^"||g' -e 's| "$||g' -e 's|"$||g' > "usr/share/licenses/${pkgname}/LICENSE"
 
   # Create soname links
   _create_links
-
 }
diff --git a/ld.so.lsi-msm-snmp.conf b/ld.so.lsi-msm-snmp.conf
index 1baf26e4a483..d2ee2e261a7e 100644
--- a/ld.so.lsi-msm-snmp.conf
+++ b/ld.so.lsi-msm-snmp.conf
@@ -1 +1 @@
-/opt/lsi/msm/lib
+/opt/lsi/snmp/lib
diff --git a/lsi-msm.install b/lsi-msm.install
index 7f967c46bb9d..e3b2cef2d418 100644
--- a/lsi-msm.install
+++ b/lsi-msm.install
@@ -17,8 +17,15 @@ post_install() {
   ldconfig &> /dev/null
 
   . /etc/profile.d/msm.sh
-  cd "$MSM_HOME"
-  /usr/lib/jvm/java-8-openjdk/jre/bin/java -Djava.util.prefs.systemRoot=$MSM_HOME/jre -Djava.util.prefs.userRoot=$MSM_HOME/jre/.userPrefs -classpath .:GUI.jar ExternalApp.ConfigRepositoryMain 71244 -set INSTALLER_VERSION "v${1%-*}"
+  cd "${MSM_HOME}"
+  LC_ALL=C \
+  /usr/lib/jvm/java-8-openjdk/jre/bin/java \
+   -Djava.util.prefs.systemRoot="${MSM_HOME}/jre" \
+   -Djava.util.prefs.userRoot="${MSM_HOME}/jre/.userPrefs" \
+   -classpath .:GUI.jar \
+   ExternalApp.ConfigRepositoryMain 71244 \
+   -set INSTALLER_VERSION "v${1%-*}" \
+   &> /dev/null
 
   _instructions
 }
@@ -27,21 +34,54 @@ post_upgrade() {
   ldconfig &> /dev/null
 
   . /etc/profile.d/msm.sh
-  cd "$MSM_HOME"
+  cd "${MSM_HOME}"
   rm -fr ActiveClientList.txt
-  /usr/lib/jvm/java-8-openjdk/jre/bin/java -Djava.util.prefs.systemRoot=$MSM_HOME/jre -Djava.util.prefs.userRoot=$MSM_HOME/jre/.userPrefs -classpath .:Framework/Framework.jar VivaldiHeartbeat ActiveClientList.txt
-  /usr/lib/jvm/java-8-openjdk/jre/bin/java -Djava.util.prefs.systemRoot=$MSM_HOME/jre -Djava.util.prefs.userRoot=$MSM_HOME/jre/.userPrefs -classpath .:GUI.jar ExternalApp.ConfigRepositoryMain 71244 -clear
-  /usr/lib/jvm/java-8-openjdk/jre/bin/java -Djava.util.prefs.systemRoot=$MSM_HOME/jre -Djava.util.prefs.userRoot=$MSM_HOME/jre/.userPrefs -classpath .:GUI.jar ExternalApp.ConfigRepositoryMain 71244 -set INSTALLER_VERSION "v${1%-*}"
+  LC_ALL=C \
+  /usr/lib/jvm/java-8-openjdk/jre/bin/java \
+    -Djava.util.prefs.systemRoot="${MSM_HOME}/jre" \
+    -Djava.util.prefs.userRoot="${MSM_HOME}/jre/.userPrefs" \
+    -classpath .:Framework/Framework.jar \
+    VivaldiHeartbeat ActiveClientList.txt \
+    &> /dev/null
+  LC_ALL=C \
+  /usr/lib/jvm/java-8-openjdk/jre/bin/java \
+    -Djava.util.prefs.systemRoot="${MSM_HOME}/jre" \
+    -Djava.util.prefs.userRoot="${MSM_HOME}/jre/.userPrefs" \
+    -classpath .:GUI.jar \
+    ExternalApp.ConfigRepositoryMain 71244 \
+    -clear \
+    &> /dev/null
+  LC_ALL=C \
+  /usr/lib/jvm/java-8-openjdk/jre/bin/java \
+    -Djava.util.prefs.systemRoot="${MSM_HOME}/jre" \
+    -Djava.util.prefs.userRoot="$MSM_HOME}/jre/.userPrefs" \
+    -classpath .:GUI.jar \
+    ExternalApp.ConfigRepositoryMain 71244 \
+    -set INSTALLER_VERSION "v${1%-*}" \
+    &> /dev/null
 
   _instructions
 }
 
 pre_remove() {
   . /etc/profile.d/msm.sh
-  cd "$MSM_HOME"
+  cd "${MSM_HOME}"
   rm -fr ActiveClientList.txt
-  /usr/lib/jvm/java-8-openjdk/jre/bin/java -Djava.util.prefs.systemRoot=$MSM_HOME/jre -Djava.util.prefs.userRoot=$MSM_HOME/jre/.userPrefs -classpath .:Framework/Framework.jar VivaldiHeartbeat ActiveClientList.txt
-  /usr/lib/jvm/java-8-openjdk/jre/bin/java -Djava.util.prefs.systemRoot=$MSM_HOME/jre -Djava.util.prefs.userRoot=$MSM_HOME/jre/.userPrefs -classpath .:GUI.jar ExternalApp.ConfigRepositoryMain 71244 -clear
+  LC_ALL=C \
+  /usr/lib/jvm/java-8-openjdk/jre/bin/java \
+    -Djava.util.prefs.systemRoot="${MSM_HOME}/jre" \
+    -Djava.util.prefs.userRoot="${MSM_HOME}/jre/.userPrefs" \
+    -classpath .:Framework/Framework.jar \
+    VivaldiHeartbeat ActiveClientList.txt \
+    &> /dev/null
+  LC_ALL=C \
+  /usr/lib/jvm/java-8-openjdk/jre/bin/java \
+    -Djava.util.prefs.systemRoot="${MSM_HOME}/jre" \
+    -Djava.util.prefs.userRoot="${MSM_HOME}/jre/.userPrefs" \
+    -classpath .:GUI.jar \
+    ExternalApp.ConfigRepositoryMain 71244 \
+    -clear \
+    &> /dev/null
 
   if [ "$(systemctl is-active lsi_msm)" = "active" ]; then
     systemctl stop lsi_msm
diff --git a/msm_profile.sh b/msm_profile.sh
index f8103b7ed207..2ad5a4e3dd57 100644
--- a/msm_profile.sh
+++ b/msm_profile.sh
@@ -1 +1,3 @@
 export MSM_HOME="/usr/share/MegaRAID_Storage_Manager"
+export PRODUCTNAME="MegaRAID Storage Manager"
+export MSM_PRODUCT="MSM"
diff --git a/tweak_scripts.diff b/tweak_scripts.diff
new file mode 100644
index 000000000000..40fa9643d396
--- /dev/null
+++ b/tweak_scripts.diff
@@ -0,0 +1,223 @@
+diff --git a/usr/share/MegaRAID_Storage_Manager/Framework/shutdown.sh b/usr/share/MegaRAID_Storage_Manager/Framework/shutdown.sh
+index 832433f..3a68c5c 100755
+--- a/usr/share/MegaRAID_Storage_Manager/Framework/shutdown.sh
++++ b/usr/share/MegaRAID_Storage_Manager/Framework/shutdown.sh
+@@ -1,6 +1,9 @@
+-#cd "$MSM_HOME/Framework"
+-#java -classpath rt.jar:jsse.jar:jce.jar -Djava.library.path=. -jar shutdown.jar
+-
+-
+-cd "$MSM_HOME/Framework"
+-$JRE_HOME/bin/java -classpath rt.jar:jsse.jar:jce.jar:Framework.jar:framework_shutdown.jar:. -Djava.library.path=. shutdown.FrameworkShutdown
++#!/usr/bin/sh
++. /etc/profile.d/msm.sh
++cd "${MSM_HOME}/Framework"
++LC_ALL=C /usr/lib/jvm/java-8-openjdk/jre/bin/java \
++  -Djava.util.prefs.systemRoot="${MSM_HOME}/jre" \
++  -Djava.util.prefs.userRoot="${MSM_HOME}/jre/.userPrefs" \
++  -classpath rt.jar:jsse.jar:jce.jar:Framework.jar:framework_shutdown.jar:. \
++  -Djava.library.path=. \
++  shutdown.FrameworkShutdown
+diff --git a/usr/share/MegaRAID_Storage_Manager/Framework/startup.sh b/usr/share/MegaRAID_Storage_Manager/Framework/startup.sh
+index 8ddda6a..a1877e0 100755
+--- a/usr/share/MegaRAID_Storage_Manager/Framework/startup.sh
++++ b/usr/share/MegaRAID_Storage_Manager/Framework/startup.sh
+@@ -1,4 +1,9 @@
+-cd "$MSM_HOME/Framework"
++#!/usr/bin/sh
++. /etc/profile.d/msm.sh
++cd "${MSM_HOME}/Framework"
+-LD_PRELOAD=amd64/libjsig.so;export LD_PRELOAD
+-LD_LIBRARY_PATH=`pwd`:/opt/lsi/Apache:/opt/lsi/Pegasus:/opt/lsi/openssl;export LD_LIBRARY_PATH
+-$JRE_HOME/bin/java -classpath $JRE_HOME/bin/javax.activation.jar:rt.jar:jsse.jar:jce.jar:javax.mail.jar:Framework.jar -Djava.library.path=. Framework.FrameworkManager
++LC_ALL=C /usr/lib/jvm/java-8-openjdk/jre/bin/java \
++  -Djava.util.prefs.systemRoot="${MSM_HOME}/jre" \
++  -Djava.util.prefs.userRoot="${MSM_HOME}/jre/.userPrefs" \
++  -classpath rt.jar:jsse.jar:jce.jar:javax.activation.jar:javax.mail.jar:Framework.jar \
++  -Djava.library.path=. \
++  Framework.FrameworkManager
+diff --git a/usr/share/MegaRAID_Storage_Manager/MegaPopup/popup b/usr/share/MegaRAID_Storage_Manager/MegaPopup/popup
+index ccc38a4..1e4f9e8 100755
+--- a/usr/share/MegaRAID_Storage_Manager/MegaPopup/popup
++++ b/usr/share/MegaRAID_Storage_Manager/MegaPopup/popup
+@@ -1,4 +1,9 @@
+-#! /bin/sh
+-. /etc/init.d/msm_profile
+-cd "$MSM_HOME/MegaPopup"
+-$JRE_HOME/bin/java -classpath .:Popup.jar:../GUI.jar Popup.Communicator ajsgyqkj=71244 &> /dev/null
++#!/usr/bin/sh
++. /etc/profile.d/msm.sh
++cd "${MSM_HOME}/MegaPopup"
++LC_ALL=C /usr/lib/jvm/java-8-openjdk/jre/bin/java \
++  -Djava.util.prefs.systemRoot="${MSM_HOME}/jre" \
++  -Djava.util.prefs.userRoot="${MSM_HOME}/jre/.userPrefs" \
++  -classpath .:Popup.jar:../GUI.jar \
++  Popup.Communicator ajsgyqkj=71244 \
++  &> /dev/null
+diff --git a/usr/share/MegaRAID_Storage_Manager/MegaPopup/shutdownpopup.sh b/usr/share/MegaRAID_Storage_Manager/MegaPopup/shutdownpopup.sh
+index 42fb383..43e31af 100755
+--- a/usr/share/MegaRAID_Storage_Manager/MegaPopup/shutdownpopup.sh
++++ b/usr/share/MegaRAID_Storage_Manager/MegaPopup/shutdownpopup.sh
+@@ -1,5 +1,9 @@
+-#! /bin/sh
+-. /etc/init.d/msm_profile
+-cd "$MSM_HOME/MegaPopup"
+-
+-$JRE_HOME/bin/java -classpath  PopupShutdown.jar:../GUI.jar shutdown.PopupShutdown 1> /dev/null 2> /dev/null
++#!/usr/bin/sh
++. /etc/profile.d/msm.sh
++cd "${MSM_HOME}/MegaPopup"
++LC_ALL=C /usr/lib/jvm/java-8-openjdk/jre/bin/java \
++  -Djava.util.prefs.systemRoot="${MSM_HOME}/jre" \
++  -Djava.util.prefs.userRoot="${MSM_HOME}/jre/.userPrefs" \
++  -classpath .:PopupShutdown.jar:../GUI.jar \
++  shutdown.PopupShutdown \
++  &> /dev/null
+diff --git a/usr/share/MegaRAID_Storage_Manager/starthelp.sh b/usr/share/MegaRAID_Storage_Manager/starthelp.sh
+old mode 100755
+new mode 100644
+index ea64995..a7da0c7
+--- a/usr/share/MegaRAID_Storage_Manager/starthelp.sh
++++ b/usr/share/MegaRAID_Storage_Manager/starthelp.sh
+@@ -1,37 +1,29 @@
+-#!/bin/sh
+-. /etc/init.d/msm_profile
+-if [ "$2" == "" ]; then
+-	DOCLANG=`echo $LANG`
+-	echo $DOCLANG
+-	EXTDIR=`echo $DOCLANG | awk '{print substr($1,1,2)}'`
+-	if [ "$EXTDIR" = "zh" ]; then
+-	        EXTDIR=`echo $DOCLANG | awk '{print substr($1,1,5)}'`
+-        	EXTDIR=`echo $EXTDIR | sed 's/_/-/g'`
+-	fi
+-	if [ -d "$MSM_HOME/docs/$EXTDIR" ]; then
+-        	DOCDIR="$MSM_HOME/docs/$EXTDIR"
+-	else
+-        	DOCDIR="$MSM_HOME/docs"
+-	fi
+-	PARAM="msmHELP.htm"
++#!/usr/bin/sh
++. /etc/profile.d/msm.sh
++if [ "${2}" == "" ]; then
++  DOCLANG="$(echo ${LANG})"
++  echo ${DOCLANG}
++  EXTDIR="$(echo $DOCLANG | awk '{print substr($1,1,2)}')"
++  if [ "$EXTDIR" = "zh" ]; then
++    EXTDIR="$(echo ${DOCLANG} | awk '{print substr($1,1,5)}')"
++    EXTDIR="$(echo ${EXTDIR} | sed 's/_/-/g')"
++  fi
++  if [ -d "${MSM_HOME}/docs/${EXTDIR}" ]; then
++    DOCDIR="${MSM_HOME}/docs/${EXTDIR}"
++  else
++    DOCDIR="${MSM_HOME}/docs"
++  fi
++  PARAM="msmHELP.htm"
+ else
+-	DOCDIR="$MSM_HOME/$1"
+-	PARAM="$2"
++  DOCDIR="${MSM_HOME}/${1}"
++  PARAM="${2}"
+ fi
+-CHECK=`which mozilla`
++CHECK="$(which xdg-open)"
+ if [ "${CHECK}" = "" ]; then
+-        echo "mozilla not present"
++  echo "xdg-open not present"
+ else
+-        mozilla "file:///$DOCDIR/$PARAM"
+-        exit
++  xdg-open "file:///${DOCDIR}/${PARAM}"
++  exit
+ fi
+ 
+-CHECK=`which firefox`
+-if [ "${CHECK}" = "" ]; then
+-        echo "firefox not present"
+-else
+-        firefox "$(echo file:///$DOCDIR/$PARAM|sed 's/ /%20/g')"
+-        exit
+-fi
+-
+-echo "Support Browser are not installed on this system. Please install mozilla/firefox to launch help"
++echo "Support Browser are not installed on this system. Please install xdg-open to launch help"
+diff --git a/usr/share/MegaRAID_Storage_Manager/startmonitorhelp.sh b/usr/share/MegaRAID_Storage_Manager/startmonitorhelp.sh
+index cb02669..952a29f 100755
+--- a/usr/share/MegaRAID_Storage_Manager/startmonitorhelp.sh
++++ b/usr/share/MegaRAID_Storage_Manager/startmonitorhelp.sh
+@@ -1,23 +1,16 @@
+-. /etc/init.d/msm_profile
+-if [ "0$1" = "0" ]; then
+-        path=docs/MegaMonitor
++#!/usr/bin/sh
++. /etc/profile.d/msm.sh
++if [ "0${1}" = "0" ]; then
++  path=docs/MegaMonitor
+ else
+-        path=$1
++  path="${1}"
+ fi
+-CHECK=`which mozilla`
++CHECK="$(which xdg-open)"
+ if [ "${CHECK}" = "" ]; then
+-        echo "mozilla not present"
++  echo "xdg-open not present"
+ else
+-        mozilla "file:///$MSM_HOME/$path/msm_monitor.htm"
+-        exit
++  xdg-open "file:///${MSM_HOME}/${path}/msm_monitor.htm"
++  exit
+ fi
+- 
+-CHECK=`which firefox`
+-if [ "${CHECK}" = "" ]; then
+-        echo "firefox not present"
+-else
+-        firefox "$(echo file:///$MSM_HOME/$path/msm_monitor.htm|sed 's/ /%20/g')"
+-        exit
+-fi
+- 
+-echo "Support Browser are not installed on this system. Please install mozilla/firefox to launch help"
++
++echo "Support Browser are not installed on this system. Please install xdg-open to launch help"
+diff --git a/usr/share/MegaRAID_Storage_Manager/startupui.sh b/usr/share/MegaRAID_Storage_Manager/startupui.sh
+index a3e78c6..719d7e2 100755
+--- a/usr/share/MegaRAID_Storage_Manager/startupui.sh
++++ b/usr/share/MegaRAID_Storage_Manager/startupui.sh
+@@ -1,8 +1,10 @@
+-if [ "$DISPLAY" = "" ]; then
+- echo "X11 Display variable is not properly set"
+-fi
+-. /etc/init.d/msm_profile
+-cd "$MSM_HOME"
++#!/usr/bin/sh
++. /etc/profile.d/msm.sh
++cd "${MSM_HOME}"
+-#XMODIFIERS=@im=none
+-$JRE_HOME/bin/java -DVENUS=true -classpath .:GUI.jar:monitorgui.jar:DebugLog.jar:log4j-1.2.15.jar:jaxen-1.1.jar:jdom-1.1.jar GUI.VivaldiStartupDialog ajsgyqkj=71244
+-
++LC_ALL=C /usr/lib/jvm/java-8-openjdk/jre/bin/java \
++  -DVENUS=true \
++  -Djava.util.prefs.systemRoot="${MSM_HOME}/jre" \
++  -Djava.util.prefs.userRoot="${MSM_HOME}/jre/.userPrefs" \
++  -classpath .:GUI.jar:monitorgui.jar:DebugLog.jar:jaxen-1.1.jar:jdom-1.1.jar \
++  GUI.VivaldiStartupDialog ajsgyqkj=71244 \
++  &> /dev/null
+diff --git a/etc/X11/xinit/xinitrc.d/popup.sh b/etc/X11/xinit/xinitrc.d/popup.sh
+index 9329228..fdc978e 100755
+--- a/etc/X11/xinit/xinitrc.d/popup.sh
++++ b/etc/X11/xinit/xinitrc.d/popup.sh
+@@ -1,13 +1,5 @@
+ #!/bin/sh
+ . /etc/init.d/msm_profile
+-cd "$MSM_HOME/MegaPopup"
+-#POPUP=popup_bin
+-#apid=`pidof ${POPUP} | cut -f1 -d" "`
+-#if [ "$apid" != "" ] ; then
+-#	./popup -stop
+-#fi
+-#if [ -f "$MSM_HOME/MegaPopup/Popup.pid" ]; then
+-#	./popup -stop
+-#fi
++cd "${MçSM_HOME}/MegaPopup"
+ ./popup &
+ cd -