[Xquartz-changes] [370] trunk/pkg/scripts

[source_changes at macosforge.org]

Revision: 370
          http://trac.macosforge.org/projects/xquartz/changeset/370
Author:   jeremyhu at freedesktop.org
Date:     2009-09-16 18:21:29 -0700 (Wed, 16 Sep 2009)
Log Message:
-----------
sl postinst script

Added Paths:
-----------
    trunk/pkg/scripts/postinst_leo.sh
    trunk/pkg/scripts/postinst_sl.sh
    trunk/pkg/scripts/preinst_leo.sh

Removed Paths:
-------------
    trunk/pkg/scripts/postinst.sh
    trunk/pkg/scripts/preinst.sh

Deleted: trunk/pkg/scripts/postinst.sh
===================================================================
--- trunk/pkg/scripts/postinst.sh	2009-08-13 14:53:01 UTC (rev 369)
+++ trunk/pkg/scripts/postinst.sh	2009-09-17 01:21:29 UTC (rev 370)
@@ -1,13 +0,0 @@
-#!/bin/sh
-# Cache system fonts
-/usr/X11/bin/font_cache --force --system
-
-# Load the privileged_startx daemon
-/bin/launchctl unload -w /System/Library/LaunchDaemons/org.x.privileged_startx.plist >& /dev/null
-/bin/launchctl load -w /System/Library/LaunchDaemons/org.x.privileged_startx.plist
-
-if [ -d /usr/X11/share/X11/xkb ] ; then
-	rm -rf /usr/X11/share/X11/xkb
-fi
-
-exit 0

Copied: trunk/pkg/scripts/postinst_leo.sh (from rev 369, trunk/pkg/scripts/postinst.sh)
===================================================================
--- trunk/pkg/scripts/postinst_leo.sh	                        (rev 0)
+++ trunk/pkg/scripts/postinst_leo.sh	2009-09-17 01:21:29 UTC (rev 370)
@@ -0,0 +1,13 @@
+#!/bin/sh
+# Cache system fonts
+/usr/X11/bin/font_cache --force --system
+
+# Load the privileged_startx daemon
+/bin/launchctl unload -w /System/Library/LaunchDaemons/org.x.privileged_startx.plist >& /dev/null
+/bin/launchctl load -w /System/Library/LaunchDaemons/org.x.privileged_startx.plist
+
+if [ -d /usr/X11/share/X11/xkb ] ; then
+	rm -rf /usr/X11/share/X11/xkb
+fi
+
+exit 0

Added: trunk/pkg/scripts/postinst_sl.sh
===================================================================
--- trunk/pkg/scripts/postinst_sl.sh	                        (rev 0)
+++ trunk/pkg/scripts/postinst_sl.sh	2009-09-17 01:21:29 UTC (rev 370)
@@ -0,0 +1,5 @@
+#!/bin/sh
+# Cache system fonts
+/opt/X11/bin/font_cache --force --system
+
+exit 0


Property changes on: trunk/pkg/scripts/postinst_sl.sh
___________________________________________________________________
Added: svn:executable
   + *

Deleted: trunk/pkg/scripts/preinst.sh
===================================================================
--- trunk/pkg/scripts/preinst.sh	2009-08-13 14:53:01 UTC (rev 369)
+++ trunk/pkg/scripts/preinst.sh	2009-09-17 01:21:29 UTC (rev 370)
@@ -1,47 +0,0 @@
-#!/bin/sh
-# Kill off old X11.app before installing because relocation will use this one
-if [ -d /usr/X11/X11.app ] ; then
-        rm -rf /usr/X11/X11.app
-fi
-
-# Remove these, so the new compressed man pages are used
-if [[ -f /usr/share/man/man1/quartz-wm.1 ]] ; then
-	rm /usr/share/man/man1/quartz-wm.1
-fi
-if [[ -d /usr/X11/man && ! -h /usr/X11/man ]] ; then
-	rm -rf /usr/X11/man
-fi
-
-# This plist is the old name (and the future name for X11.app)
-if [ -f /System/Library/LaunchAgents/org.x.X11.plist ] ; then
-	/bin/launchctl unload -w /System/Library/LaunchAgents/org.x.X11.plist
-        rm /System/Library/LaunchAgents/org.x.X11.plist
-fi
-if [ -f /Library/LaunchAgents/org.x.X11.plist ] ; then
-	/bin/launchctl unload -w /Library/LaunchAgents/org.x.X11.plist
-        rm /Library/LaunchAgents/org.x.X11.plist
-fi
-
-# This is done now by startx
-if [ -f /System/Library/LaunchAgents/org.x.fontconfig.plist ] ; then
-	/bin/launchctl unload -w /System/Library/LaunchAgents/org.x.fontconfig.plist
-        rm /System/Library/LaunchAgents/org.x.fontconfig.plist
-fi
-
-# This is done now by privileged_startx
-if [ -f /System/Library/LaunchDaemons/org.x.font_cache.plist ] ; then
-	/bin/launchctl unload -w /System/Library/LaunchDaemons/org.x.font_cache.plist
-	rm /System/Library/LaunchDaemons/org.x.font_cache.plist
-fi
-
-# This stuff was moved to xinit dir in the final release of 2.2.0
-[ -f /usr/X11/bin/privileged_startx ] && rm /usr/X11/bin/privileged_startx
-[ -f /usr/X11/sbin/privileged_startx.sh ] && rm /usr/X11/sbin/privileged_startx.sh
-
-# Renamed to drop the .sh
-[ -f /usr/X11/bin/font_cache.sh ] && rm /usr/X11/bin/font_cache.sh
-
-[ -f /usr/X11/lib/X11/xinit/xinitrc.d/98-pbproxy.sh ] && rm /usr/X11/lib/X11/xinit/xinitrc.d/98-pbproxy.sh
-[ -f /usr/X11/lib/X11/xinit/xinitrc.d/98-xpbproxy.sh ] && rm /usr/X11/lib/X11/xinit/xinitrc.d/98-xpbproxy.sh
-
-exit 0

Copied: trunk/pkg/scripts/preinst_leo.sh (from rev 369, trunk/pkg/scripts/preinst.sh)
===================================================================
--- trunk/pkg/scripts/preinst_leo.sh	                        (rev 0)
+++ trunk/pkg/scripts/preinst_leo.sh	2009-09-17 01:21:29 UTC (rev 370)
@@ -0,0 +1,47 @@
+#!/bin/sh
+# Kill off old X11.app before installing because relocation will use this one
+if [ -d /usr/X11/X11.app ] ; then
+        rm -rf /usr/X11/X11.app
+fi
+
+# Remove these, so the new compressed man pages are used
+if [[ -f /usr/share/man/man1/quartz-wm.1 ]] ; then
+	rm /usr/share/man/man1/quartz-wm.1
+fi
+if [[ -d /usr/X11/man && ! -h /usr/X11/man ]] ; then
+	rm -rf /usr/X11/man
+fi
+
+# This plist is the old name (and the future name for X11.app)
+if [ -f /System/Library/LaunchAgents/org.x.X11.plist ] ; then
+	/bin/launchctl unload -w /System/Library/LaunchAgents/org.x.X11.plist
+        rm /System/Library/LaunchAgents/org.x.X11.plist
+fi
+if [ -f /Library/LaunchAgents/org.x.X11.plist ] ; then
+	/bin/launchctl unload -w /Library/LaunchAgents/org.x.X11.plist
+        rm /Library/LaunchAgents/org.x.X11.plist
+fi
+
+# This is done now by startx
+if [ -f /System/Library/LaunchAgents/org.x.fontconfig.plist ] ; then
+	/bin/launchctl unload -w /System/Library/LaunchAgents/org.x.fontconfig.plist
+        rm /System/Library/LaunchAgents/org.x.fontconfig.plist
+fi
+
+# This is done now by privileged_startx
+if [ -f /System/Library/LaunchDaemons/org.x.font_cache.plist ] ; then
+	/bin/launchctl unload -w /System/Library/LaunchDaemons/org.x.font_cache.plist
+	rm /System/Library/LaunchDaemons/org.x.font_cache.plist
+fi
+
+# This stuff was moved to xinit dir in the final release of 2.2.0
+[ -f /usr/X11/bin/privileged_startx ] && rm /usr/X11/bin/privileged_startx
+[ -f /usr/X11/sbin/privileged_startx.sh ] && rm /usr/X11/sbin/privileged_startx.sh
+
+# Renamed to drop the .sh
+[ -f /usr/X11/bin/font_cache.sh ] && rm /usr/X11/bin/font_cache.sh
+
+[ -f /usr/X11/lib/X11/xinit/xinitrc.d/98-pbproxy.sh ] && rm /usr/X11/lib/X11/xinit/xinitrc.d/98-pbproxy.sh
+[ -f /usr/X11/lib/X11/xinit/xinitrc.d/98-xpbproxy.sh ] && rm /usr/X11/lib/X11/xinit/xinitrc.d/98-xpbproxy.sh
+
+exit 0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20090916/db5e0a27/attachment.html>