Note: these were made against a pristine version of the script so they can
be applied to the version in sources, not relying on my earlier patches.
As a result, this first one is the second patch which fixes the "pgslq"
typo.
To make them both applicable, I have revised the first one (which fixed
typos and removed the "set -x" at the top), and included it below this
one.
Applied in order, exclusive of anything I posted previously, these should
both work.
Unless Erik objects, can these be applied to the one in trunk sometime
soon?
I have others that may be more objectionable, which I'll post later today.
--- orig/tools/prepare-company-database.sh 2011-06-14 22:03:22.000000000
+0000
+++ prepare-company-database.sh 2011-06-16 09:13:17.000000000 +0000
@@ -39,7 +39,7 @@
as specified in the argument list.
After the database has been created, the script inserts a default user
-'$ADMIN_USER' (password: '$ADMIN_PASSWORD'), with these initial values:
+'$ADMIN_USERNAME' (password: '$ADMIN_PASSWORD'), with these initial values:
First name: $ADMIN_FIRSTNAME (NULL == none)
Middle name: $ADMIN_MIDDLENAME (NULL == none)
@@ -56,7 +56,7 @@
--host The PostgreSQL host to connect to (see 'man psql')
[$host]
--port The PostgreSQL port to connect to (see 'man psql')
[$port]
--pgsql-contrib The directory where the tsearch2.sql, pg_trgm.sql and
- tablefunc.sql PostgeSQL are located [$pgslq_contrib_dir]
+ tablefunc.sql PostgreSQL are located [$pgsql_contrib_dir] [*]
--company The name of the database to be created for the company [*]
--owner The name of the superuser which is to become owner of the
company's database [$owner]
--- orig/tools/prepare-company-database.sh 2011-06-14 22:03:22.000000000
+0000
+++ prepare-company-database.sh 2011-06-16 00:33:47.000000000 +0000
@@ -1,7 +1,5 @@
#!/bin/sh
-set -x
-
# Script to explain the steps to take when installing LedgerSMB
# Default variable values section
@@ -28,10 +26,10 @@
usage () {
script_name=`basename $0`
cat <<USAGE
-usage: $script_name [option1 .. optionN]
+usage: $script_name --company COMPANY --psql-contrib DIR [option1 .. optionN]
This script wants to be run as the root user. If you don't, you'll be
-asked to enter the password of the 'postres' user
+asked to enter the password of the 'postgres' user
This script creates a 'ledgersmb' user on the specified PostgreSQL host,
if it does not exist. Then it proceeds to load the LedgerSMB database
@@ -46,7 +44,7 @@
Last name: $ADMIN_LASTNAME (NULL == none)
Country: 'US'
-This default user will be assigned all priviledges within the application.
+This default user will be assigned all privileges within the application.
Available options:
--srcdir The path where the sources for LedgerSMB are located
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
Ledger-smb-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ledger-smb-devel
