Changeset 35069 in vbox

Timestamp:

Dec 14, 2010 12:27:11 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

68900

Message:

Installer/solaris: shift mime/desktop update around to avoid confusing installer output

File:

• trunk/src/VBox/Installer/solaris/vboxconfig.sh (modified) (2 diffs)

trunk/src/VBox/Installer/solaris/vboxconfig.sh

@@ -796 +796 @@
         fi
 
-        if test -d $PKG_INSTALL_ROOT/usr/share/icons; then
-            infoprint "Installing MIME types and icons"
-            if test "$REMOTEINST" -eq 0; then
-                /usr/bin/update-mime-database /usr/share/mime 2>/dev/null
-                /usr/bin/update-desktop-database -q 2>/dev/null
-            else
-                subprint "Skipped for targetted installs."
-            fi
-        fi
-
         # Enable Zone access service for non-remote installs, other services (Webservice) are delivered disabled by the manifest class action
         if test "$REMOTEINST" -eq 0; then
@@ -816 +806 @@
                     subprint "Loading Zone access service  ...FAILED."
                 fi
+            fi
+        fi
+
+        # Update mime and desktop databases to get the right menu entries
+        # and icons. There is still some delay until the GUI picks it up,
+        # but that cannot be helped.
+        if test -d $PKG_INSTALL_ROOT/usr/share/icons; then
+            infoprint "Installing MIME types and icons"
+            if test "$REMOTEINST" -eq 0; then
+                /usr/bin/update-mime-database /usr/share/mime 2>/dev/null
+                /usr/bin/update-desktop-database -q 2>/dev/null
+            else
+                subprint "Skipped for targetted installs."
             fi
         fi