Changeset 36757 in vbox

Timestamp:

Apr 20, 2011 2:54:34 PM (14 years ago)

Author:

vboxsync

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

71296

Message:

deb/rpm fixes

Location:

trunk/src/VBox/Installer/linux

Files:

• debian/rules (modified) (1 diff)
• rpm/VirtualBox.tmpl.spec (modified) (1 diff)

trunk/src/VBox/Installer/linux/debian/rules

@@ -210 +210 @@
         install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor
         cd $(archdir)/icons; for i in *; do \
+            if [ -f $$i/virtualbox.png ]; then
+              install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor/$$i/apps; \
+              mv $$i/virtualbox.png $(prefix)/usr/share/icons/hicolor/$$i/apps; \
+            fi; \
             install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor/$$i/mimetypes; \
-            install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor/$$i/apps; \
-            mv $$i/virtualbox.png $(prefix)/usr/share/icons/hicolor/$$i/apps || true; \
             mv $$i/* $(prefix)/usr/share/icons/hicolor/$$i/mimetypes || true; \
             rmdir $$i; \

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -98 +98 @@
 cd icons
   for i in *; do
+    if [ -f $i/virtualbox.png ]; then
+      install -d $RPM_BUILD_ROOT/usr/share/icons/hicolor/$i/apps
+      mv $i/virtualbox.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/$i/apps
+    fi
     install -d $RPM_BUILD_ROOT/usr/share/icons/hicolor/$i/mimetypes
-    mv $i/virtualbox.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/$i/apps || true
     mv $i/* $RPM_BUILD_ROOT/usr/share/icons/hicolor/$i/mimetypes || true
     rmdir $i