Merge remote branch 'gitorious/1.0.x' into 1.0.x

[quix0rs-gnu-social.git] / scripts / rebuilddb_psql.sh

diff --git a/scripts/rebuilddb_psql.sh b/scripts/rebuilddb_psql.sh
index ac169c205da2da4c29e4cf10c4257b89629a71df..6b15b9212fb3435a059150a791e42e94afd12ea8 100755 (executable)
--- a/scripts/rebuilddb_psql.sh
+++ b/scripts/rebuilddb_psql.sh
@@ -5,7 +5,7 @@
 # below, AND backed up your database. Failure to observe these instructions
 # may result in losing all the data in your database.
 #
-# This script is used to upgrade Laconica's PostgreSQL database to the
+# This script is used to upgrade StatusNet's PostgreSQL database to the
 # latest version. It does the following:
 # 
 #  1. Dumps the existing data to /tmp/rebuilddb_psql.sql
@@ -15,7 +15,7 @@
 #
 # You MUST run this script as the 'postgres' user.
 # You MUST be able to write to /tmp/rebuilddb_psql.sql
-# You MUST specify the laconica database user and database name on the
+# You MUST specify the statusnet database user and database name on the
 # command line, e.g. ./rebuilddb_psql.sh myuser mydbname
 #
 
@@ -27,7 +27,7 @@ cd `dirname $0`
 pg_dump -a -D --disable-trigger $DB > /tmp/rebuilddb_psql.sql
 psql -c "drop schema public cascade; create schema public;" $DB
 psql -c "grant all privileges on schema public to $user;" $DB
-psql $DB < ../db/laconica_pg.sql
+psql $DB < ../db/statusnet_pg.sql
 psql $DB < /tmp/rebuilddb_psql.sql
 for tab in `psql -c '\dts' $DB -tA | cut -d\| -f2`; do
   psql -c "ALTER TABLE \"$tab\" OWNER TO $user;" $DB