Changeset 35054 in vbox

Timestamp:

Dec 14, 2010 9:17:34 AM (14 years ago)

Author:

vboxsync

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

68885

Message:

Installer/solaris: fix mime icon install location and database update

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (2 diffs)
• makepackage.sh (modified) (2 diffs)
• vboxconfig.sh (modified) (1 diff)

trunk/src/VBox/Installer/solaris/Makefile.kmk

@@ -176 +176 @@
         $(SOLARIS_USRSHR_ICONS_DIR) \
     $(foreach s,16 20 24 32 48 64 72 96 128 256,\
-            $(SOLARIS_USRSHR_ICONS_DIR)/$(s)x$(s))
+            $(SOLARIS_USRSHR_ICONS_DIR)/$(s)x$(s) \
+            $(SOLARIS_USRSHR_ICONS_DIR)/$(s)x$(s)/mimetypes)
 
 VBOX_MIME_ICONS = \
@@ -187 +188 @@
         $(foreach f,ova ovf vbox vbox-extpack, \
             $(foreach s,16 20 24 32 48 64 72 96 128 256,\
-                $(s)x$(s)/virtualbox-$(f).png))
+                $(s)x$(s)/mimetypes/virtualbox-$(f).png))
 
 

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

@@ -19 +19 @@
 #
 # Usage:
-#       makespackage.sh [--hardened] $(PATH_TARGET)/install packagename {$(KBUILD_TARGET_ARCH)|neutral} $(VBOX_SVN_REV) [VBIPackageName]
+#       makepackage.sh [--hardened] $(PATH_TARGET)/install packagename {$(KBUILD_TARGET_ARCH)|neutral} $(VBOX_SVN_REV) [VBIPackageName]
 
 
@@ -139 +139 @@
 
 # Include opt/VirtualBox and subdirectories as we want uninstall to clean up directory structure.
-# Inlcude var/svc for manifest class action script does not create them.
+# Include var/svc for manifest class action script does not create them.
 find . -type d | $VBOX_GGREP -E 'opt/VirtualBox|var/svc/manifest/application/virtualbox' | pkgproto >> prototype
 

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

@@ -799 +799 @@
             infoprint "Installing MIME types and icons"
             if test "$REMOTEINST" -eq 0; then
-                update-mime-database -q 2>/dev/null
-                update-desktop-database -q 2>/dev/null
+                /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."