[Xquartz-changes] [623] trunk/pkg

[source_changes at macosforge.org]

Revision: 623
          http://trac.macosforge.org/projects/xquartz/changeset/623
Author:   jeremyhu at freedesktop.org
Date:     2012-04-13 17:14:38 -0700 (Fri, 13 Apr 2012)
Log Message:
-----------
Add a preinst script

Modified Paths:
--------------
    trunk/pkg/XQuartz.pmdoc/01x.xml
    trunk/pkg/scripts/postinst_sl.sh

Added Paths:
-----------
    trunk/pkg/scripts/preinst_sl.sh

Modified: trunk/pkg/XQuartz.pmdoc/01x.xml
===================================================================
--- trunk/pkg/XQuartz.pmdoc/01x.xml	2012-04-07 06:09:56 UTC (rev 622)
+++ trunk/pkg/XQuartz.pmdoc/01x.xml	2012-04-14 00:14:38 UTC (rev 623)
@@ -17,6 +17,7 @@
     <mod>parent</mod>
   </config>
   <scripts>
+    <preinstall mod="true">@@PKG_DIR@@/resources/scripts/preinst_sl.sh</preinstall>
     <postinstall mod="true">@@PKG_DIR@@/resources/scripts/postinst_sl.sh</postinstall>
     <scripts-dir mod="true">@@PKG_DIR@@/resources/scripts</scripts-dir>
   </scripts>

Modified: trunk/pkg/scripts/postinst_sl.sh
===================================================================
--- trunk/pkg/scripts/postinst_sl.sh	2012-04-07 06:09:56 UTC (rev 622)
+++ trunk/pkg/scripts/postinst_sl.sh	2012-04-14 00:14:38 UTC (rev 623)
@@ -22,11 +22,13 @@
 [[ -e /usr/X11 ]] || ln -s /opt/X11 /usr/X11
 [[ -e /usr/X11R6 ]] || ln -s /opt/X11 /usr/X11R6
 
-/usr/bin/osascript <<EOF
+if [[ -e /tmp/.xquartz_first_time ]] ; then
+    /usr/bin/osascript <<EOF
         tell application "System Events"
             activate
-            display dialog "If this is your first time installing XQuartz, you may want to log out and log back in to make it your default X11 server." buttons {"OK"}
+            display dialog "You will need to log out and log back in to make XQuartz your default X11 server." buttons {"OK"}
         end tell
 EOF
+fi
 
 exit 0

Added: trunk/pkg/scripts/preinst_sl.sh
===================================================================
--- trunk/pkg/scripts/preinst_sl.sh	                        (rev 0)
+++ trunk/pkg/scripts/preinst_sl.sh	2012-04-14 00:14:38 UTC (rev 623)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+[[ -e /Library/LaunchDaemons/org.macosforge.xquartz.privileged_startx.plist ]] || touch /tmp/.xquartz_first_time
+
+exit 0


Property changes on: trunk/pkg/scripts/preinst_sl.sh
___________________________________________________________________
Added: svn:executable
   + *
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20120413/438410ca/attachment.html>