Merge lp:~jontai/openvista-gtm-integration/bug409102 into lp:openvista-gtm-integration

[Jon Tai]

[jeff.apple (jeff-apple)]

review: Approve

=== modified file 'scripts/usr/sbin/ovinstanceadd'
--- scripts/usr/sbin/ovinstanceadd	2009-08-11 20:47:56 +0000
+++ scripts/usr/sbin/ovinstanceadd	2009-10-22 01:00:24 +0000
@@ -111,8 +111,26 @@
     exit 1
 fi
 
-# find the latest version of GT.M installed on this system 
-gtm=`ls -B -1 /opt/lsb-gtm 2> /dev/null | tail -n1`
+# find the latest version of GT.M installed on this system.   to qualify as a
+# valid GT.M version, the GT.M directory must contain a mumps executable and an
+# openvista.xc file (the latter is installed by the corresponding
+# openvista-libs-* package)
+#
+# sort using only the GT.M version (not including the _ and the arch) because _
+# sorts after A, so if we were to use the entire directory name, V5.3-004A_i686
+# would come before V5.3-004_i686 (so V5.3-004_i686 would be considered the
+# "later" version), which is wrong.
+for version in `ls -1 -d /opt/lsb-gtm/V*_i686 /opt/lsb-gtm/V*_x86_64 2> /dev/null | cut -d _ -f 1 | sort -r`; do
+    # prefer 64-bit GT.M over 32-bit GT.M
+    if [ -x "${version}_x86_64/mumps" ] && [ -f "${version}_x86_64/openvista.xc" ]; then
+        gtm="${version}_x86_64"
+        break
+    fi
+    if [ -x "${version}_i686/mumps" ] && [ -f "${version}_i686/openvista.xc" ]; then
+        gtm="${version}_i686"
+        break
+    fi
+done
 
 if [ -z "$gtm" ]; then
     echo "ovinstanceadd: No versions of GT.M found in /opt/lsb-gtm" >&2
@@ -159,7 +177,7 @@
     install -o root -g $user -m 2770 -d "$root/$instance/backups" &&
     install -o root -g $user -m 2750 -d "$root/$instance/etc" &&
     install -o root -g $user -m 2770 -d "$root/$instance/tmp" &&
-    ln -s "/opt/lsb-gtm/$gtm" "$root/$instance/gtm"
+    ln -s "$gtm" "$root/$instance/gtm"
 } || {
     echo "ovinstanceadd: Unable to create instance directories" >&2
     exit 1