Split package for separate libopenpegasus in other package (for use with other LSI software)

6 files changed, 83 insertions, 162 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8871a243ccf9..8bf4cb2bcb29 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,22 @@
 # Generated by mksrcinfo v8
-# Tue Jul 18 23:17:31 UTC 2017
+# Tue Sep  5 17:19:27 UTC 2017
 pkgbase = lsi-msm
 	pkgdesc = LSI Logic MegaRAID Storage Manager Suite
 	pkgver = 17.05.00.02
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.avagotech.com/products/server-storage
 	install = lsi-msm.install
 	arch = i686
 	arch = x86_64
 	license = custom:LSI
-	license = custom:TOG
-	makedepends = icu
-	makedepends = openslp
-	makedepends = sqlite
-	makedepends = lynx
-	depends = libxtst
-	depends = alsa-lib
-	depends = libnet
-	depends = libxslt
+	makedepends = setconf
+	depends = lsi-openpegasus
 	depends = unixodbc
 	depends = net-snmp
 	depends = perl-net-snmp
 	depends = perl-term-readkey
 	depends = xdg-utils
-	depends = gtk2
+	depends = java-environment
 	options = !strip
 	backup = etc/lsi_mrdsnmp/LSI_StorSNMP.ini
 	backup = etc/lsi_mrdsnmp/sas/sas_TrapDestination.conf
@@ -39,34 +32,18 @@ pkgbase = lsi-msm
 	backup = usr/share/MegaRAID_Storage_Manager/MegaPopup/vivaldikey.properties
 	backup = usr/share/MegaRAID_Storage_Manager/MegaPopup/vivaldikeys
 	backup = usr/share/MegaRAID_Storage_Manager/MegaPopup/vivaldikeys2048
-	source = lynx_script_for_download_pegasus
-	source = https://collaboration.opengroup.org/pegasus/documents/32572/pegasus-2.14.1.tar.gz
 	source = msm_profile.sh
 	source = LSI_StorSNMP.ini
 	source = lsi_msm.service
 	source = lsi_mrdsnmpd.service
 	source = ld.so.lsi-msm.conf
 	source = https://www.broadcom.com/docs-and-downloads/advanced-software/advanced-software-common-files/SLA_AdvancedSoftware.pdf
-	source = http://pkgs.fedoraproject.org/cgit/rpms/tog-pegasus.git/plain/pegasus-2.7.0-PIE.patch
-	source = http://pkgs.fedoraproject.org/cgit/rpms/tog-pegasus.git/plain/pegasus-2.9.0-no-rpath.patch
-	source = http://pkgs.fedoraproject.org/cgit/rpms/tog-pegasus.git/plain/pegasus-2.13.0-gcc5-build.patch
-	source = http://pkgs.fedoraproject.org/cgit/rpms/tog-pegasus.git/plain/pegasus-2.14.1-build-fixes.patch
-	source = http://pkgs.fedoraproject.org/cgit/rpms/tog-pegasus.git/plain/pegasus-2.14.1-ssl-include.patch
-	source = http://pkgs.fedoraproject.org/cgit/rpms/tog-pegasus.git/plain/pegasus-2.14.1-openssl-1.1-fix.patch
-	sha256sums = 72d24d357601b9df8a418a7e7851d3b55c32614394e5507146fe961e4712c5e8
-	sha256sums = 9f2f13a35da218f3cb6e8478246ff7c4d3010560bb4d5de9cbf4272d48e353fb
 	sha256sums = 11892783bc2569ad1f4bac0ec8f91f1e7e54c795f9b6454e93348a6ca0cf2a5b
 	sha256sums = 605adcb662fb457609e81fb8916da7e88541e81dd0c112a8bb569d84df189bff
 	sha256sums = c33714f33698ab2aebb28b040ed78dba5efbda0429be51662fc635ba49fd235a
 	sha256sums = 98bfc8d174cd2b056353742dc52c40f56bb77676e816f33184ab1de3e8108cfd
-	sha256sums = 633c100edb3323eed256ea1247791104ad4622b4f234ccbc6723b0afd67706d5
+	sha256sums = 9277df42e8fbd4c952f222f281e87f1d05c6e6dbf3c4fc8a6fbe75ae8098e05f
 	sha256sums = 9be6a8818ea1dccec65d48b86dd0cc62009dc3886229e3dce41192a241bd55c3
-	sha256sums = e3924bdb81a4dd2cedfb9c7ba669cb01b32f4c4e16b3af4c06f9a2426a9274d1
-	sha256sums = 66141323d6de100d9a1805f614a950944e223a36026b62b1a823c8aa148f26df
-	sha256sums = 8a68ecbd383f9121e54bd32f6094b2793367c15d8960ea5f92691e5b9bbcad99
-	sha256sums = 5863314f2ff17c32bc340efd5241f809bc1372b8e2fde0b3a2e22c7ab9b64281
-	sha256sums = 5de02253442ef8cb3b6f744fa4dd3237b66d96911ab8badd63336a7e1d28a429
-	sha256sums = deb3e52e5406419cc42d15f1a668ed291ef8337217bb5bc9cefd01ef3b804371
 	source_i686 = 17.05.00.02_Linux-x86_MSM.gz::https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/17.05.00.02_Linux-32_MSM.gz
 	depends_i686 = libxi
 	depends_i686 = libxft
diff --git a/.gitignore b/.gitignore
index 0d30ef143de6..0fa152170faf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,3 @@
 !lsi-msm.install
 !msm_profile.sh
 !ld.so.lsi-msm.conf
-!lynx_script_for_download_pegasus
diff --git a/PKGBUILD b/PKGBUILD
index 3da3b212cf5c..5afd972f2ab1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,21 +3,18 @@
 pkgname=lsi-msm
 _pkgver=17.05.00-02
 pkgver="${_pkgver//-/.}"
-pkgrel=1
+pkgrel=2
 pkgdesc="LSI Logic MegaRAID Storage Manager Suite"
 arch=('i686' 'x86_64')
 url='http://www.avagotech.com/products/server-storage'
-license=('custom:LSI' 'custom:TOG')
-depends=('libxtst'
-         'alsa-lib'
-         'libnet'
-         'libxslt'
+license=('custom:LSI')
+depends=('lsi-openpegasus'
          'unixodbc'
          'net-snmp'
          'perl-net-snmp'
          'perl-term-readkey'
          'xdg-utils'
-         'gtk2'
+         'java-environment'
          )
 depends_i686=('libxi'
               'libxft'
@@ -35,46 +32,22 @@ depends_x86_64=('lib32-libxi'
                 'lib32-libxxf86vm'
                 # 'lib32-xerces-c'
                 )
-makedepends=('icu'
-             'openslp'
-             'sqlite'
-             'lynx'
-             )
-          # OpenPegasus site don't like wget/curl. :/
-DLAGENTS=('https::/usr/bin/lynx -accept_all_cookies -cmd_script=lynx_script_for_download_pegasus %u'
-          'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u')
-source=('lynx_script_for_download_pegasus' #IMPORTANT for download pegasus zip. please don't move to other place
-        'https://collaboration.opengroup.org/pegasus/documents/32572/pegasus-2.14.1.tar.gz'
-        'msm_profile.sh'
+makedepends=('setconf')
+source=('msm_profile.sh'
         'LSI_StorSNMP.ini'
         'lsi_msm.service'
         'lsi_mrdsnmpd.service'
         'ld.so.lsi-msm.conf'
         'https://www.broadcom.com/docs-and-downloads/advanced-software/advanced-software-common-files/SLA_AdvancedSoftware.pdf'
-        'http://pkgs.fedoraproject.org/cgit/rpms/tog-pegasus.git/plain/pegasus-2.7.0-PIE.patch'
-        'http://pkgs.fedoraproject.org/cgit/rpms/tog-pegasus.git/plain/pegasus-2.9.0-no-rpath.patch'
-        'http://pkgs.fedoraproject.org/cgit/rpms/tog-pegasus.git/plain/pegasus-2.13.0-gcc5-build.patch'
-        'http://pkgs.fedoraproject.org/cgit/rpms/tog-pegasus.git/plain/pegasus-2.14.1-build-fixes.patch'
-        'http://pkgs.fedoraproject.org/cgit/rpms/tog-pegasus.git/plain/pegasus-2.14.1-ssl-include.patch'
-        'http://pkgs.fedoraproject.org/cgit/rpms/tog-pegasus.git/plain/pegasus-2.14.1-openssl-1.1-fix.patch'
         )
 source_i686=("${pkgver}_Linux-x86_MSM.gz::https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/${pkgver}_Linux-32_MSM.gz")
 source_x86_64=("${pkgver}_Linux-x64_MSM.gz::https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/${pkgver}_Linux-64_MSM.gz")
-sha256sums=('72d24d357601b9df8a418a7e7851d3b55c32614394e5507146fe961e4712c5e8'
-            '9f2f13a35da218f3cb6e8478246ff7c4d3010560bb4d5de9cbf4272d48e353fb'
-            '11892783bc2569ad1f4bac0ec8f91f1e7e54c795f9b6454e93348a6ca0cf2a5b'
+sha256sums=('11892783bc2569ad1f4bac0ec8f91f1e7e54c795f9b6454e93348a6ca0cf2a5b'
             '605adcb662fb457609e81fb8916da7e88541e81dd0c112a8bb569d84df189bff'
             'c33714f33698ab2aebb28b040ed78dba5efbda0429be51662fc635ba49fd235a'
             '98bfc8d174cd2b056353742dc52c40f56bb77676e816f33184ab1de3e8108cfd'
-            '633c100edb3323eed256ea1247791104ad4622b4f234ccbc6723b0afd67706d5'
-            '9be6a8818ea1dccec65d48b86dd0cc62009dc3886229e3dce41192a241bd55c3'
-            'e3924bdb81a4dd2cedfb9c7ba669cb01b32f4c4e16b3af4c06f9a2426a9274d1'
-            '66141323d6de100d9a1805f614a950944e223a36026b62b1a823c8aa148f26df'
-            '8a68ecbd383f9121e54bd32f6094b2793367c15d8960ea5f92691e5b9bbcad99'
-            '5863314f2ff17c32bc340efd5241f809bc1372b8e2fde0b3a2e22c7ab9b64281'
-            '5de02253442ef8cb3b6f744fa4dd3237b66d96911ab8badd63336a7e1d28a429'
-            'deb3e52e5406419cc42d15f1a668ed291ef8337217bb5bc9cefd01ef3b804371'
-            )
+            '9277df42e8fbd4c952f222f281e87f1d05c6e6dbf3c4fc8a6fbe75ae8098e05f'
+            '9be6a8818ea1dccec65d48b86dd0cc62009dc3886229e3dce41192a241bd55c3')
 sha256sums_i686=('1a61f3e0099aa962d07303555cfdb1265b2dd83348d3e1b3f1d6c36d53babd36')
 sha256sums_x86_64=('63f0d87feba33a7602cdd7488317519edc33442037e1bbaef9f55ce9bd5ea3dd')
 install=lsi-msm.install
@@ -98,7 +71,6 @@ options=('!strip')
 _create_links() {
   # create soname links
   for _lib in $(find "${pkgdir}/usr/lib" -name '*.so*' && \
-                find "${pkgdir}/opt/lsi/Pegasus" -name '*.so*' && \
                 find "${pkgdir}/opt/lsi/msm/lib" -name '*.so*' && \
                 find "${pkgdir}/opt/lsi/snmp/lib" -name '*.so*'); do
     _soname=$(dirname "${_lib}")/$(readelf -d "${_lib}" | grep -Po 'SONAME.*: \[\K[^]]*' || true)
@@ -108,55 +80,44 @@ _create_links() {
   done
 }
 
-prepare() {
-  # Patch pegasus-toc sources
-  cd pegasus
-  patch -p1 -i "${srcdir}/pegasus-2.7.0-PIE.patch"
-  patch -p1 -i "${srcdir}/pegasus-2.9.0-no-rpath.patch"
-  patch -p1 -i "${srcdir}/pegasus-2.13.0-gcc5-build.patch"
-  patch -p1 -i "${srcdir}/pegasus-2.14.1-build-fixes.patch"
-  patch -p1 -i "${srcdir}/pegasus-2.14.1-ssl-include.patch"
-  patch -p1 -i "${srcdir}/pegasus-2.14.1-openssl-1.1-fix.patch"
-
-  sed 's|libbase=lib64|libbase=lib|g' -i configure
-}
-
-build() {
-  msg2 "Build Pegasus-TOG framework"
-  cd pegasus
-  ./configure
-  make -f GNUmakefile
-}
-
 package() {
   cd "${pkgdir}"
 
   # Extract RPM's
-  for i in $(find "${srcdir}/disk" -type f -name '*.rpm'); do bsdtar -xf "${i}"; done &> /dev/null
+  for i in $(find "${srcdir}/disk" -type f -name 'MegaRAID*.rpm' -o -name 'sas_*.rpm'); do bsdtar -xf "${i}"; done &> /dev/null
 
   # Move to correct place
   [ "${CARCH}" = "x86_64" ] && mv usr/lib64 usr/lib
   mv usr/local usr/share
   mv "usr/share/MegaRAID Storage Manager" usr/share/MegaRAID_Storage_Manager
 
-  # setup shortcuts
+  # 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"
 
-  # setup installation properties
-  echo INSTALLATION_MODE=0 > usr/share/MegaRAID_Storage_Manager/installationmode.properties
+  # Remove unused files
+  find . -name '*.log' -delete
+  rm -fr etc/init.d \
+         etc/lsi_mrdsnmp/lsi_mrdsnmpd.{rh,suse} \
+         etc/lsi_mrdsnmp/sas{,-ir}/{install,uninstall} \
+         usr/share/MegaRAID_Storage_Manager/setdisp.png.old \
+         usr/share/MegaRAID_Storage_Manager/*desktop.{SuSE,redhat} \
+         usr/share/MegaRAID_Storage_Manager/{uninstaller,pwd,.__uninst}.sh \
+         usr/share/MegaRAID_Storage_Manager/vmware{35,40} \
+         usr/share/MegaRAID_Storage_Manager/jre
 
-  # Set correct path in desktop launchers and fix entries
-  sed -e 's|local/MegaRAID Storage Manager|share/MegaRAID_Storage_Manager|g' \
-      -e 's|SystemSetup||g' \
-      -i usr/share/applications/*.desktop
-  sed '/SubstituteUID/d' -i usr/share/applications/MSMHelp.desktop
+  # Setup installation properties
+  setconf -a usr/share/MegaRAID_Storage_Manager/installationmode.properties INSTALLATION_MODE=0
 
   # Fix permisions
-  find . -type d -not \( -path */jre/* -prune \) -print0 2>/dev/null | xargs -0r chmod 755
-  find . -type f -not \( -path */jre/* -prune \) -print0 2>/dev/null | xargs -0r chmod 644
-  for i in $(find . -type f -not \( -path */jre/* -prune \) -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
+  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
   chmod +x etc/lsi_mrdsnmp/lsi_mrdsnmp{agent,main}
 
   # Make symlinks
@@ -168,17 +129,35 @@ package() {
   for i in $(find . -type f -name '*.sh' -o -name 'popup'); do sed -e '/msm_profile/d' -i "${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
-
-  # Remove unused path in usr/share/MegaRAID_Storage_Manager/Framework/startup.sh
-  sed -e 's|:/opt/lsi/Apache||g' -e 's|:/opt/lsi/openssl||g' -i usr/share/MegaRAID_Storage_Manager/Framework/startup.sh
+  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|/usr/lib/jvm/`archlinux-java get`/jre|g' \
+      -e 's|/usr/lib/jvm/`archlinux-java get`/jre/lib/rt.jar:/usr/lib/jvm/`archlinux-java get`/jre/lib/jsse.jar:/usr/lib/jvm/`archlinux-java get`/jre/lib/jce.jar:||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 's|./jre|/usr/lib/jvm/`archlinux-java get`/jre|g' \
+      -i usr/share/MegaRAID_Storage_Manager/startupui.sh \
+
+  # Remove unused LD_LIBRARY_PATH
+  sed '/^LD_LIBRARY_PATH/d' \
+      -i usr/share/MegaRAID_Storage_Manager/Framework/startup.sh
 
   # Add missing #! in scripts
-  sed '1i#!/usr/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
+  sed '1i#!/usr/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
 
   # Install services and other files
   install -Dm644 "${srcdir}/lsi_msm.service" usr/lib/systemd/system/lsi_msm.service
@@ -186,43 +165,17 @@ package() {
 
   install -Dm755 "${srcdir}/msm_profile.sh" etc/profile.d/msm.sh
 
-  install -Dm644 "${srcdir}/LSI_StorSNMP.ini"  etc/lsi_mrdsnmp/LSI_StorSNMP.ini
-
-  # Remove unused files
-  find . -name '*.log' -delete
-  rm -fr etc/init.d \
-         etc/lsi_mrdsnmp/lsi_mrdsnmpd.{rh,suse} \
-         etc/lsi_mrdsnmp/sas{,-ir}/{install,uninstall} \
-         usr/share/MegaRAID_Storage_Manager/*desktop.{SuSE,redhat} \
-         usr/share/MegaRAID_Storage_Manager/{uninstaller,pwd,.__uninst}.sh \
-         usr/share/MegaRAID_Storage_Manager/vmware{35,40}
-
-  # Instal compiled Pegasus framework libraries
-  rm -fr opt/lsi/Pegasus
-  local _pegasus_lib=('libpegclient.so.1'
-                      'libpegcommon.so.1'
-                      'libpegconfig.so.1'
-                      'libpegcql.so.1'
-                      'libpegexportserver.so.1'
-                      'libpeglistener.so.1'
-                      'libpegprovider.so.1'
-                      'libpegslp_client.so.1'
-                      'libpegquerycommon.so.1'
-                      'libpegqueryexpression.so.1'
-                      'libpegwql.so.1'
-                     )
-  for i in ${_pegasus_lib[@]}; do install -Dm755 "${srcdir}/pegasus/lib/${i}" "opt/lsi/Pegasus/${i}"; done
+  install -Dm644 "${srcdir}/LSI_StorSNMP.ini" etc/lsi_mrdsnmp/LSI_StorSNMP.ini
 
   # Create soname links
   _create_links
 
-  # Add /opt/lsi/msm/lib, /opt/lsi/Pegasus and /opt/lsi/snmp/lib to ldconf search path
-  install -Dm644 "${srcdir}/ld.so.lsi-msm.conf" etc/ld.so.conf.d/lsi.conf
+  # Add /opt/lsi/msm/lib and /opt/lsi/snmp/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
+  # 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 -Dm644 "${srcdir}/pegasus/OpenPegasusNOTICE.txt" "usr/share/licenses/${pkgname}/OpenPegasusNOTICE.txt"
 }
diff --git a/ld.so.lsi-msm.conf b/ld.so.lsi-msm.conf
index 01a4163eb31f..a09010abf38b 100644
--- a/ld.so.lsi-msm.conf
+++ b/ld.so.lsi-msm.conf
@@ -1,3 +1,2 @@
 /opt/lsi/msm/lib
 /opt/lsi/snmp/lib
-/opt/lsi/Pegasus
diff --git a/lsi-msm.install b/lsi-msm.install
index 1c42c2f2e293..1ec30a32da46 100644
--- a/lsi-msm.install
+++ b/lsi-msm.install
@@ -6,30 +6,30 @@ green="${bold}$(tput setaf 2)"
 
 _instructions_install() {
   printf "${yellow}==>${all_off} ${bold}ATENTION:${all_off}
-${green}==>${all_off} First Steps needed for run '${bold}LSI MegaRAID SNMP Agent${all_off}':
-  ${blue}->${all_off} Create or edit the file: '${bold}/etc/snmp/snmpd.conf${all_off}' and put in:
+${green}==>${all_off} ${bold}First Steps needed for run 'LSI MegaRAID SNMP Agent':${all_off}
+  ${blue}->${all_off} Create or edit the file: '${bold}/etc/snmp/snmpd.conf${all_off}' and put in this content:
      '${bold}pass .1.3.6.1.4.1.3582 /usr/bin/lsi_mrdsnmpmain${all_off}' and save.
   ${blue}->${all_off} Edit the file '${bold}/etc/lsi_mrdsnmp/LSI_StorSNMP.ini${all_off}'
      and comment out the option you want use.
   ${blue}->${all_off} For start '${bold}LSI MegaRAID Storage Manager Framework${all_off}' service, run:
-     '# ${bold}systemctl start lsi_msm${all_off}'
+     '\x23 ${bold}systemctl start lsi_msm${all_off}'
   ${blue}->${all_off} For start '${bold}LSI MegaRAID SNMP Agent${all_off}' service, run:
-     '# ${bold}systemctl start lsi_mrdsnmpd${all_off}'
-  ${blue}->${all_off} For open '${bold}LSI MegaRAID Storage Manager${bold}' client:
+     '\x23 ${bold}systemctl start lsi_mrdsnmpd${all_off}'
+  ${blue}->${all_off} For open '${bold}LSI MegaRAID Storage Manager${all_off}' client:
      '${bold}Menu${all_off}' -> '${bold}System${all_off}' -> '${bold}MegaRAID Storage Manager StartupUI${all_off}'
      Or launch:
-     # '${bold}/usr/share/MegaRAID_Storage_Manager/startupui.sh${all_off}'\n"
+     '\x23 ${bold}/usr/share/MegaRAID_Storage_Manager/startupui.sh${all_off}'\n"
 }
 
 _instructions_update() {
     printf "${yellow}==>${all_off} ${bold}ATENTION:${all_off}\n"
   if [ -f /etc/snmp/snmpd.conf ]; then
-    printf "${green}==>${all_off} The file '${bold}/etc/snmp/snmpd.conf${all_off}' is found.
+    printf "${green}==>${all_off} ${bold}The file '/etc/snmp/snmpd.conf' is found${all_off}.
   ${blue}->${all_off} Please make sure if have this content:
      '${bold}pass .1.3.6.1.4.1.3582 /usr/bin/lsi_mrdsnmpmain${all_off}'
      before start/restart the '${bold}LSI MegaRAID SNMP Agent${all_off}' service.\n"
   else
-    printf "${green}==>${all_off} The file '${bold}/etc/snmp/snmpd.conf${all_off}' is not found.
+    printf "${green}==>${all_off} ${bold}The file '/etc/snmp/snmpd.conf' is not found.${all_off}
   ${blue}->${all_off} Please Create and put this content:
      '${bold}pass .1.3.6.1.4.1.3582 /usr/bin/lsi_mrdsnmpmain${all_off}'
      before start/restart the '${bold}LSI MegaRAID SNMP Agent${all_off}' service.\n"
@@ -39,7 +39,7 @@ _instructions_update() {
 post_install() {
   ldconfig &> /dev/null
   cd "/usr/share/MegaRAID_Storage_Manager"
-  jre/bin/java -classpath .:GUI.jar ExternalApp.ConfigRepositoryMain 71244 -set INSTALLER_VERSION "v${1%-*}" &> /dev/null
+  /usr/lib/jvm/`archlinux-java get`/jre/bin/java -classpath .:GUI.jar ExternalApp.ConfigRepositoryMain 71244 -set INSTALLER_VERSION "v${1%-*}" &> /dev/null
 
   _instructions_install
 }
@@ -49,9 +49,9 @@ post_upgrade() {
 
   cd "/usr/share/MegaRAID_Storage_Manager"
   rm -fr ActiveClientList.txt
-  jre/bin/java -classpath .:Framework/Framework.jar VivaldiHeartbeat ActiveClientList.txt &> /dev/null
-  jre/bin/java -classpath .:GUI.jar ExternalApp.ConfigRepositoryMain 71244 -clear &> /dev/null
-  jre/bin/java -classpath .:GUI.jar ExternalApp.ConfigRepositoryMain 71244 -set INSTALLER_VERSION "v${1%-*}" &> /dev/null
+  /usr/lib/jvm/`archlinux-java get`/jre/bin/java -classpath .:Framework/Framework.jar VivaldiHeartbeat ActiveClientList.txt &> /dev/null
+  /usr/lib/jvm/`archlinux-java get`/jre/bin/java -classpath .:GUI.jar ExternalApp.ConfigRepositoryMain 71244 -clear &> /dev/null
+  /usr/lib/jvm/`archlinux-java get`/jre/bin/java -classpath .:GUI.jar ExternalApp.ConfigRepositoryMain 71244 -set INSTALLER_VERSION "v${1%-*}" &> /dev/null
 
   _instructions_update
 }
@@ -59,16 +59,16 @@ post_upgrade() {
 pre_remove() {
   cd "/usr/share/MegaRAID_Storage_Manager"
   rm -fr ActiveClientList.txt
-  jre/bin/java -classpath .:Framework/Framework.jar VivaldiHeartbeat ActiveClientList.txt  &> /dev/null
-  jre/bin/java -classpath .:GUI.jar ExternalApp.ConfigRepositoryMain 71244 -clear  &> /dev/null
+  /usr/lib/jvm/`archlinux-java get`/jre/bin/java -classpath .:Framework/Framework.jar VivaldiHeartbeat ActiveClientList.txt  &> /dev/null
+  /usr/lib/jvm/`archlinux-java get`/jre/bin/java -classpath .:GUI.jar ExternalApp.ConfigRepositoryMain 71244 -clear  &> /dev/null
 
   if [ "$(systemctl is-active lsi_msm)" = "active" ]; then
     systemctl stop lsi_msm &> /dev/null
-    printf "${yellow}==>${all_off} Stopping '${bold}lsi_msm${all_off}' Service\n"
+    printf "${green}==>${all_off} ${bold}Stopping 'lsi_msm' Service${all_off}.\n"
   fi
   if [ "$(systemctl is-enabled lsi_msm)" = "enable" ]; then
     systemctl disable lsi_msm &> /dev/null
-    printf "${yellow}==>${all_off} Disabling '${bold}lsi_msm${all_off}' Service\n"
+    printf "${green}==>${all_off} ${bold}Disabling 'lsi_msm' Service${all_off}.\n"
   fi
 }
 
diff --git a/lynx_script_for_download_pegasus b/lynx_script_for_download_pegasus
deleted file mode 100644
index 7382aa8bc153..000000000000
--- a/lynx_script_for_download_pegasus
+++ /dev/null
@@ -1,7 +0,0 @@
-key ^J
-key D
-key Down Arrow
-key ^J
-key ^J
-key q
-key y