[PC-BSD Commits] r4609 - in pbibuild/pbi-source: PBIsource PBItext

[svn at pcbsd.org]

Author: kris
Date: 2009-10-08 09:09:13 -0700 (Thu, 08 Oct 2009)
New Revision: 4609

Modified:
   pbibuild/pbi-source/PBIsource/pbi.cpp
   pbibuild/pbi-source/PBItext/main.cpp
Log:

Fixed a bug with installing menu / desktop icons with PBIs on 8.0, need to unset XDG_DATA_DIRS before
we mess with them, since that variable may mess up clean removal of the files



Modified: pbibuild/pbi-source/PBIsource/pbi.cpp
===================================================================
--- pbibuild/pbi-source/PBIsource/pbi.cpp	2009-10-08 15:29:33 UTC (rev 4608)
+++ pbibuild/pbi-source/PBIsource/pbi.cpp	2009-10-08 16:09:13 UTC (rev 4609)
@@ -76,9 +76,17 @@
 
      // Setup our scripts for xdg / desktop stuff
      IconScript << "#!/bin/sh" << "# Script which installs xdg data";
+     IconScript << "XDG_DATA_DIRS=''; export XDG_DATA_DIRS";
+     IconScript << "XDG_CONFIG_DIRS=''; export XDG_CONFIG_DIRS";
      IconUnScript << "#!/bin/sh" << "# Script which installs xdg data";
+     IconUnScript << "XDG_DATA_DIRS=''; export XDG_DATA_DIRS";
+     IconUnScript << "XDG_CONFIG_DIRS=''; export XDG_CONFIG_DIRS";
      DesktopScript << "#!/bin/sh" << "# Script which installs desktop data";
+     DesktopScript << "XDG_DATA_DIRS=''; export XDG_DATA_DIRS";
+     DesktopScript << "XDG_CONFIG_DIRS=''; export XDG_CONFIG_DIRS";
      DesktopUnScript << "#!/bin/sh" << "# Script which installs desktop data";
+     DesktopUnScript << "XDG_DATA_DIRS=''; export XDG_DATA_DIRS";
+     DesktopUnScript << "XDG_CONFIG_DIRS=''; export XDG_CONFIG_DIRS";
      haveDesktopIcon = false;
 
 }

Modified: pbibuild/pbi-source/PBItext/main.cpp
===================================================================
--- pbibuild/pbi-source/PBItext/main.cpp	2009-10-08 15:29:33 UTC (rev 4608)
+++ pbibuild/pbi-source/PBItext/main.cpp	2009-10-08 16:09:13 UTC (rev 4609)
@@ -71,9 +71,18 @@
 {
     // Setup our scripts for xdg / desktop stuff
     IconScript << "#!/bin/sh" << "# Script which installs xdg data";
+    IconScript << "XDG_DATA_DIRS=''; export XDG_DATA_DIRS";
+    IconScript << "XDG_CONFIG_DIRS=''; export XDG_CONFIG_DIRS";
     IconUnScript << "#!/bin/sh" << "# Script which installs xdg data";
+    IconUnScript << "XDG_DATA_DIRS=''; export XDG_DATA_DIRS";
+    IconUnScript << "XDG_CONFIG_DIRS=''; export XDG_CONFIG_DIRS";
     DesktopScript << "#!/bin/sh" << "# Script which installs desktop data";
+    DesktopScript << "XDG_DATA_DIRS=''; export XDG_DATA_DIRS";
+    DesktopScript << "XDG_CONFIG_DIRS=''; export XDG_CONFIG_DIRS";
     DesktopUnScript << "#!/bin/sh" << "# Script which installs desktop data";
+    DesktopUnScript << "XDG_DATA_DIRS=''; export XDG_DATA_DIRS";
+    DesktopUnScript << "XDG_CONFIG_DIRS=''; export XDG_CONFIG_DIRS";
+
     haveDesktopIcon = false;