[Python-apps-commits] r8109 - in packages/openerp6/trunk (2 files)

[xnox-guest at users.alioth.debian.org]

    Date: Tuesday, January 24, 2012 @ 22:19:25
  Author: xnox-guest
Revision: 8109

Fix up postinst

Modified:
  packages/openerp6/trunk/debian/	(properties)
  packages/openerp6/trunk/debian/openerp6-server.postinst

Modified: packages/openerp6/trunk/debian/openerp6-server.postinst
===================================================================
--- packages/openerp6/trunk/debian/openerp6-server.postinst	2012-01-24 20:36:58 UTC (rev 8108)
+++ packages/openerp6/trunk/debian/openerp6-server.postinst	2012-01-24 22:19:25 UTC (rev 8109)
@@ -5,27 +5,27 @@
 . /usr/share/debconf/confmodule
 . /usr/share/dbconfig-common/dpkg/postinst.pgsql
 
-CONF="/etc/openerp6-server.conf"
-CONFTPL="/usr/share/openerp6/server.conf.tpl"
-USER="openerp6"
+CONF=/etc/openerp6-server.conf
+CONFTPL=/usr/share/openerp6/server.conf.tpl
+USER=openerp6
 if ! getent passwd | grep -q "^$USER:"; then
     adduser --system --no-create-home --quiet --gecos 'Open ERP server' --group $USER
 fi
-chown -R $USER:$USER $CONF /var/lib/openerp6-server /var/log/openerp6-server
 
 dbc_pgsql_createdb_encoding="UTF8"
-dbc_generate_include='template:$CONF'
-dbc_generate_include_owner='$USER:$USER'
-dbc_generate_include_args='--ucf -o template_infile=$CONFTPL'
+dbc_generate_include="template:${CONF}"
+dbc_generate_include_owner="${USER}:${USER}"
+dbc_generate_include_args="-o template_infile=${CONFTPL} -U"
 dbc_go openerp6 $@
 
 db_version 2.0
 db_get openerp6-server/password
-if [ "$RET" = ""]; then
+if [ "${RET}" = ""]; then
     _PASSWORD="admin"
 else
-    _PASSWORD="$RET"
+    _PASSWORD="${RET}"
 fi
-sed -i -e "s|^admin_passwd.*$|admin_passwd = $_PASSWORD|" $CONFFILE
+sed -i -e "s/^admin_passwd.*$/admin_passwd = ${_PASSWORD}/" ${CONF}
+chown -R ${USER}:${USER} ${CONF} /var/lib/openerp6 /var/log/openerp6
 
 #DEBHELPER#