bk commit into 4.0 tree (lenz:1.2129) BUG#11380

[lenz]

Below is the list of changes that have just been committed into a local
4.0 repository of lenz. When lenz does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2129 05/08/11 20:23:12 lenz@stripped +3 -0
  - Fix for BUG#11380 (as recommened by JimW): renamed the preinstall/postinstall scripts
to
    preflight/postflight instead, so they are run every time a PKG is installed, not only
for
    a fresh installation

  support-files/MacOSX/preflight.sh
    1.3 05/08/11 20:23:09 lenz@stripped +2 -2
    - Fix for BUG#11380 (as recommened by JimW): renamed the preinstall/postinstall
scripts to
      preflight/postflight instead, so they are run every time, not only for a fresh
installation
    - fixed comment typo

  support-files/MacOSX/postflight.sh
    1.5 05/08/11 20:23:09 lenz@stripped +1 -1
    - Fix for BUG#11380 (as recommened by JimW): renamed the preinstall/postinstall
scripts to
      preflight/postflight instead, so they are run every time, not only for a fresh
installation

  support-files/MacOSX/Makefile.am
    1.8 05/08/11 20:23:09 lenz@stripped +6 -6
    - Fix for BUG#11380 (as recommened by JimW): renamed the preinstall/postinstall
scripts to
      preflight/postflight instead, so they are run every time, not only for a fresh
installation

  support-files/MacOSX/postflight.sh
    1.4 05/08/11 20:15:43 lenz@stripped +0 -0
    Rename: support-files/MacOSX/postinstall.sh -> support-files/MacOSX/postflight.sh

  support-files/MacOSX/preflight.sh
    1.2 05/08/11 20:15:11 lenz@stripped +0 -0
    Rename: support-files/MacOSX/preinstall.sh -> support-files/MacOSX/preflight.sh

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lenz
# Host:	metis.lenznet
# Root:	/space/my/mysql-4.0-merge

--- 1.7/support-files/MacOSX/Makefile.am	2005-08-11 20:13:10 +02:00
+++ 1.8/support-files/MacOSX/Makefile.am	2005-08-11 20:23:09 +02:00
@@ -20,8 +20,8 @@
 EXTRA_DIST =	Info.plist.sh \
 		Description.plist.sh \
 		StartupParameters.plist.sh \
-		postinstall.sh \
-		preinstall.sh \
+		postflight.sh \
+		preflight.sh \
 		ReadMe.txt \
 		MySQL \
 		StartupItem.Description.plist \
@@ -31,14 +31,14 @@
 noinst_DATA = Info.plist \
 		Description.plist \
 		StartupParameters.plist \
-		postinstall \
-		preinstall
+		postflight \
+		preflight
 
 CLEANFILES =	Info.plist \
 		Description.plist \
 		StartupParameters.plist \
-		postinstall \
-		preinstall
+		postflight \
+		preflight
 
 SUFFIXES = .sh
 

--- 1.3/support-files/MacOSX/postinstall.sh	2003-05-12 17:09:29 +02:00
+++ 1.5/support-files/MacOSX/postflight.sh	2005-08-11 20:23:09 +02:00
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# postinstall - this script will be executed after the MySQL PKG
+# postfligh - this script will be executed after the MySQL PKG
 # installation has been performed.
 #
 # This script will install the MySQL privilege tables using the

--- 1.1/support-files/MacOSX/preinstall.sh	2003-02-19 20:54:41 +01:00
+++ 1.3/support-files/MacOSX/preflight.sh	2005-08-11 20:23:09 +02:00
@@ -1,10 +1,10 @@
 #!/bin/sh
 #
-# preinstall - this script will be executed before the MySQL PKG
+# preflight - this script will be executed before the MySQL PKG
 # installation will be performed.
 #
 # If this package has been compiled with a prefix ending with "mysql" (e.g.
-# /usr/local/mysql or /opt/mysql), it will rename any previosuly existing
+# /usr/local/mysql or /opt/mysql), it will rename any previously existing
 # directory with this name before installing the new package (which includes
 # a symlink named "mysql", pointing to the newly installed directory, which
 # is named mysql-<version>)