From 63f1e7499c2f9e6ada10cd036dc8e042f6256d2a Mon Sep 17 00:00:00 2001 From: Bernd Finger Date: Wed, 11 Dec 2024 11:45:44 +0100 Subject: [PATCH] sap_install_media_detect: Fix wrong sap_export_solman_java detection Fixes #921. The SAP Solution Manager JAVA Export file (e.g. 51054655_4.zip) contains files with the search pattern for 'sap_export_nwas_java' before files with the search pattern for 'sap_export_solman_java'. So we fall through (= do no longer exit) for the search pattern of the SAP Netweaver Java files (e.g. 51055106.zip). This will work as long as such files do not have content which are matched by any other search pattern. Tested with: 51050829_3 (NW 7.5 Installation Export) 51054655_1 (SAP Solution Manager 7.2 SR2 Installation Export I) 51054655_2 (SAP Solution Manager 7.2 SR2 Installation Export II) 51054655_4 (SAP Solution Manager 7.2 SR2 - Java) 51055106 (SAP Netweaver 7.5 SP22 Java) $ sapfile *.zip 51050829_3.zip: sap_export_nwas_abap 51054655_1.zip: sap_export_solman_abap 51054655_2.zip: sap_export_solman_abap 51054655_4.zip: sap_export_solman_java 51055106.zip: sap_export_nwas_java Signed-off-by: Bernd Finger --- roles/sap_install_media_detect/files/tmp/sapfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/sap_install_media_detect/files/tmp/sapfile b/roles/sap_install_media_detect/files/tmp/sapfile index 034285ef6..94f5d6e09 100755 --- a/roles/sap_install_media_detect/files/tmp/sapfile +++ b/roles/sap_install_media_detect/files/tmp/sapfile @@ -286,7 +286,7 @@ for _FILE in "$@"; do /db2setup/{_sap_file_type="ibmdb2"; exit} /db6_update_client.sh/{_sap_file_type="ibmdb2_client"; exit} /db2aese_c.lic/{_sap_file_type="ibmdb2_license"; exit} - /DATA_UNITS\/JAVA_EXPORT_JDMP/{_sap_file_type="sap_export_nwas_java"; exit} + /DATA_UNITS\/JAVA_EXPORT_JDMP/{_sap_file_type="sap_export_nwas_java"} /DATA_UNITS\/EXPORT/{_sap_file_type="sap_export_ecc"; exit} /DATA_UNITS\/EXP[0-9]/{_sap_file_type="sap_export_nwas_abap"; exit} /DATA_UNITS\/SOLMAN/&&/_JAVA_UT/{_sap_file_type="sap_export_solman_java"; exit}