Index: /freepbx/trunk/amp_conf/bin/bounce_op.sh
===================================================================
--- /freepbx/trunk/amp_conf/bin/bounce_op.sh (revision 4993)
+++ /freepbx/trunk/amp_conf/bin/bounce_op.sh (revision 5122)
@@ -1,3 +1,3 @@
-#!/usr/bin/env sh
+#!/bin/bash
 killall op_server.pl
 
Index: /freepbx/trunk/apply_conf.sh
===================================================================
--- /freepbx/trunk/apply_conf.sh (revision 3994)
+++ /freepbx/trunk/apply_conf.sh (revision 5122)
@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 if [ "$1" == "-h" ]
@@ -31,11 +31,11 @@
 
 echo "$ASTETCDIR/cdr_mysql.conf"
-sed -i.bak "s/user=[a-zA-Z0-9]*/user=$AMPDBUSER/" $ASTETCDIR/cdr_mysql.conf
-sed -i.bak "s/password=[a-zA-Z0-9]*/password=$AMPDBPASS/" $ASTETCDIR/cdr_mysql.conf
-sed -i.bak "s/hostname=[a-zA-Z0-9.-]*/hostname=$AMPDBHOST/" $ASTETCDIR/cdr_mysql.conf
+sed -i.bak "s/user\s*=.*$/user = $AMPDBUSER/" $ASTETCDIR/cdr_mysql.conf
+sed -i.bak "s/password\s*=.*$/password = $AMPDBPASS/" $ASTETCDIR/cdr_mysql.conf
+sed -i.bak "s/hostname\s*=.*$/hostname = $AMPDBHOST/" $ASTETCDIR/cdr_mysql.conf
 
 echo "$ASTETCDIR/manager.conf"
-sed -i.bak "s/secret = [a-zA-Z0-9]*/secret = $AMPMGRPASS/" $ASTETCDIR/manager.conf
-sed -i.bak "s/\[AMPMGRUSER\]/\[$AMPMGRUSER\]/" $ASTETCDIR/manager.conf
+sed -i.bak "s/secret\s*=.*$/secret = $AMPMGRPASS/" $ASTETCDIR/manager.conf
+sed -i.bak "s/\s*\[general\].*$/TEMPCONTEXT/;s/\[.*\]/\[$AMPMGRUSER\]/;s/^TEMPCONTEXT$/\[general\]/" $ASTETCDIR/manager.conf
 
 echo "$ASTETCDIR/vm_email.inc"