From 2277fec784a483fc1a4632cca83fa9139e43170b Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 28 May 2012 18:27:41 -0500 Subject: [PATCH] IDEMPIERE-279 RUN_ImportAdempiere not working on server installer / unix part --- .../utils.unix/RUN_ImportAdempiere.sh | 5 ++++- .../utils.unix/oracle/ImportAdempiere.sh | 6 +++--- .../utils.unix/postgresql/ImportAdempiere.sh | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/org.adempiere.server-feature/utils.unix/RUN_ImportAdempiere.sh b/org.adempiere.server-feature/utils.unix/RUN_ImportAdempiere.sh index 12a4b9d702..703acf93f7 100644 --- a/org.adempiere.server-feature/utils.unix/RUN_ImportAdempiere.sh +++ b/org.adempiere.server-feature/utils.unix/RUN_ImportAdempiere.sh @@ -18,7 +18,10 @@ fi echo Re-Create Adempiere User and import $ADEMPIERE_HOME/data/Adempiere${SUFFIX}.dmp - \($ADEMPIERE_DB_NAME\) echo == The import will show warnings. This is OK == -ls -lsa $ADEMPIERE_HOME/data/Adempiere${SUFFIX}.dmp +cd $ADEMPIERE_HOME/data/seed +jar xvf Adempiere${SUFFIX}.jar +cd $ADEMPIERE_HOME/utils +ls -lsa $ADEMPIERE_HOME/data/seed/Adempiere${SUFFIX}.dmp echo Press enter to continue ... read in diff --git a/org.adempiere.server-feature/utils.unix/oracle/ImportAdempiere.sh b/org.adempiere.server-feature/utils.unix/oracle/ImportAdempiere.sh index fbcdc2c145..2c7769d644 100644 --- a/org.adempiere.server-feature/utils.unix/oracle/ImportAdempiere.sh +++ b/org.adempiere.server-feature/utils.unix/oracle/ImportAdempiere.sh @@ -3,7 +3,7 @@ # $Id: ImportAdempiere.sh,v 1.10 2005/12/20 07:12:17 jjanke Exp $ echo Adempiere Database Import $Revision: 1.10 $ -echo Importing Adempiere DB from $ADEMPIERE_HOME/data/Adempiere.dmp +echo Importing Adempiere DB from $ADEMPIERE_HOME/data/seed/Adempiere.dmp if [ $# -le 2 ] then @@ -29,8 +29,8 @@ sqlplus $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME @$ADEMPIER echo ------------------------------------- echo Import Adempiere.dmp echo ------------------------------------- -echo "imp $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/Adempiere.dmp FROMUSER=\(reference\) TOUSER=$2" -imp $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/Adempiere.dmp FROMUSER=\(reference\) TOUSER=$2 +echo "imp $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/seed/Adempiere.dmp FROMUSER=\(reference\) TOUSER=$2" +imp $1@$ADEMPIERE_DB_SERVER:$ADEMPIERE_DB_PORT/$ADEMPIERE_DB_NAME FILE=$ADEMPIERE_HOME/data/seed/Adempiere.dmp FROMUSER=\(reference\) TOUSER=$2 echo ------------------------------------- echo Check System diff --git a/org.adempiere.server-feature/utils.unix/postgresql/ImportAdempiere.sh b/org.adempiere.server-feature/utils.unix/postgresql/ImportAdempiere.sh index 7fe1d079bd..1d5e7faf23 100644 --- a/org.adempiere.server-feature/utils.unix/postgresql/ImportAdempiere.sh +++ b/org.adempiere.server-feature/utils.unix/postgresql/ImportAdempiere.sh @@ -3,7 +3,7 @@ # $Id: ImportAdempiere.sh,v 1.10 2005/12/20 07:12:17 jjanke Exp $ echo Adempiere Database Import $Revision: 1.10 $ -echo Importing Adempiere DB from $ADEMPIERE_HOME/data/Adempiere_pg.dmp +echo Importing Adempiere DB from $ADEMPIERE_HOME/data/seed/Adempiere_pg.dmp if [ $# -le 2 ] then @@ -43,7 +43,7 @@ echo Import Adempiere_pg.dmp echo ------------------------------------- ADEMPIERE_ALTER_ROLE_SQL="ALTER ROLE $2 SET search_path TO adempiere, pg_catalog" psql -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -d $ADEMPIERE_DB_NAME -U $2 -c "$ADEMPIERE_ALTER_ROLE_SQL" -psql -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -d $ADEMPIERE_DB_NAME -U $2 -f $ADEMPIERE_HOME/data/Adempiere_pg.dmp +psql -h $ADEMPIERE_DB_SERVER -p $ADEMPIERE_DB_PORT -d $ADEMPIERE_DB_NAME -U $2 -f $ADEMPIERE_HOME/data/seed/Adempiere_pg.dmp ADEMPIERE_ALTER_ROLE_SQL= PGPASSWORD= export PGPASSWORD