[Rt-commit] rt branch, 4.0/make-upgradedb, created. rt-4.0.2-112-g248522d

[Alex Vandiver]

The branch, 4.0/make-upgradedb has been created
        at  248522d0a1d0adf4d85bf7e33ca7f2d74458f2d5 (commit)

- Log -----------------------------------------------------------------
commit 248522d0a1d0adf4d85bf7e33ca7f2d74458f2d5
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Sep 21 19:00:32 2011 -0400

    Provide an upgrade-database target to ease upgrades
    
    This not only reduces typos by makign the command shorter, it encourages
    the command to be run from the source directory.

diff --git a/Makefile.in b/Makefile.in
index 6a1152d..73744d7 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -254,7 +254,7 @@ upgrade-instruct:
 	@echo "Congratulations. RT has been upgraded. You should now check over"
 	@echo "$(CONFIG_FILE) for any necessary site customization. Additionally,"
 	@echo "you should update RT's system database objects by running "
-	@echo "    $(RT_SBIN_PATH)/rt-setup-database --prompt-for-dba-password --action upgrade"
+	@echo "    make upgrade-database"
 
 
 upgrade: testdeps config-install dirs files-install fixperms upgrade-instruct
@@ -362,6 +362,9 @@ initdb :: initialize-database
 initialize-database: 
 	$(PERL) -I$(LOCAL_LIB_PATH) -I$(RT_LIB_PATH) sbin/rt-setup-database --action init --prompt-for-dba-password
 
+upgrade-database:
+	$(PERL) -I$(LOCAL_LIB_PATH) -I$(RT_LIB_PATH) sbin/rt-setup-database --action upgrade --prompt-for-dba-password
+
 dropdb: 
 	$(PERL) -I$(LOCAL_LIB_PATH) -I$(RT_LIB_PATH) sbin/rt-setup-database --action drop --prompt-for-dba-password
 
diff --git a/README b/README
index 0ad7bce..d14c91e 100644
--- a/README
+++ b/README
@@ -162,8 +162,7 @@ GENERAL INSTALLATION
 
       This will also prompt you to upgrade your database by running:
 
-          /opt/rt4/sbin/rt-setup-database \
-              --prompt-for-dba-password --action upgrade
+          make upgrade-database
 
       You should back up your database before running this command.
       When you run it, you will be prompted for your previous version of

-----------------------------------------------------------------------