Core changes to prepare for MQ V9.0.4

install-mq.sh

@@ -42,8 +42,9 @@ apt-get install -y --no-install-recommends \
   util-linux
 
 # Download and extract the MQ installation files
-mkdir -p /tmp/mq
-cd /tmp/mq
+DIR_EXTRACT=/tmp/mq
+mkdir -p ${DIR_EXTRACT} 
+cd ${DIR_EXTRACT}
 curl -LO $MQ_URL
 tar -zxvf ./*.tar.gz
 
@@ -59,11 +60,15 @@ apt-get autoremove -y
 groupadd --system --gid 999 mqm
 useradd --system --uid 999 --gid mqm mqm
 usermod -G mqm root
-cd /tmp/mq/DebianMQServer
+
+# Find directory containing .deb files
+DIR_DEB=$(find ${DIR_EXTRACT} -name "*.deb" -printf "%h\n" | sort -u | head -1)
+# Find location of mqlicense.sh
+MQLICENSE=$(find ${DIR_EXTRACT} -name "mqlicense.sh")
 
 # Accept the MQ license
-./mqlicense.sh -text_only -accept
-echo "deb [trusted=yes] file:/tmp/mq/DebianMQServer ./" > /etc/apt/sources.list.d/IBM_MQ.list
+${MQLICENSE} -text_only -accept
+echo "deb [trusted=yes] file:${DIR_DEB} ./" > /etc/apt/sources.list.d/IBM_MQ.list
 
 # Install MQ using the DEB packages
 apt-get update
@@ -80,7 +85,7 @@ find /opt/mqm -name '*.tar.gz' -delete
 
 # Clean up all the downloaded files
 rm -f /etc/apt/sources.list.d/IBM_MQ.list
-rm -rf /tmp/mq
+rm -rf ${DIR_EXTRACT}
 
 # Apply any bug fixes not included in base Ubuntu or MQ image.
 # Don't upgrade everything based on Docker best practices https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/#run