Index: freepbx/branches/1.0/apply_conf.sh
===================================================================
--- freepbx/branches/1.0/apply_conf.sh (revision 735)
+++ freepbx/branches/1.0/apply_conf.sh (revision 2035)
@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/bin/sh
 
 if [ "$1" == "-h" ]
@@ -28,5 +28,4 @@
 source $AMPCONFIG
 
-
 echo "Updating configuration..."
 
@@ -36,13 +35,6 @@
 sed -r -i "s/hostname=[a-zA-Z0-9]*/hostname=$AMPDBHOST/" /etc/asterisk/cdr_mysql.conf
 
-# do a bunch at once here
-find $AMPWEBROOT/admin/ -name retrieve\*.pl
-sed -r -i "s/username = \"[a-zA-Z0-9]*\";/username = \"$AMPDBUSER\";/" `find $AMPWEBROOT/admin/ -name retrieve\*.pl`
-sed -r -i "s/password = \"[a-zA-Z0-9]*\";/password = \"$AMPDBPASS\";/" `find $AMPWEBROOT/admin/ -name retrieve\*.pl`
-sed -r -i "s/hostname = \"[a-zA-Z0-9]*\";/hostname = \"$AMPDBHOST\";/" `find $AMPWEBROOT/admin/ -name retrieve\*.pl`
-
 # sort option for FOP
 sed -r -i "s/sortoption = \"[a-zA-Z0-9]*\";/sortoption = \"$FOPSORT\";/" $AMPWEBROOT/admin/retrieve_op_conf_from_mysql.pl
-
 sed -r -i "s!op_conf = \"[^\"]*\";!op_conf = \"$AMPWEBROOT\/panel\/op_buttons_additional.cfg\";!" $AMPWEBROOT/admin/retrieve_op_conf_from_mysql.pl
 
@@ -64,7 +56,4 @@
 sed -r -i "s!web_hostname=[a-zA-Z0-9\.]*!web_hostname=$AMPWEBADDRESS!" $FOPWEBROOT/op_server.cfg
 
-
-
-
 echo "/etc/asterisk/vm_email.inc"
 sed -r -i "s!http://.*/cgi-bin!http://$AMPWEBADDRESS/cgi-bin!" /etc/asterisk/vm_email.inc
@@ -75,4 +64,2 @@
 $AMPSBIN/amportal chown
 echo "Done"
-exit
-