From bd6f785921051405a9d4d010095f6e5755628d06 Mon Sep 17 00:00:00 2001 From: Dovi Cowan Date: Tue, 10 Aug 2021 17:50:46 +0100 Subject: [PATCH] fixed replacements --- confGen | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/confGen b/confGen index 796707e..c6ace59 100755 --- a/confGen +++ b/confGen @@ -45,36 +45,36 @@ with open('templates/'+args['device']+'.xml', 'r') as file: data = file.read().replace('\n', '') if args['provName'] is None: - data.replace("{NAME}",'Nokia SIP') + data = data.replace("{NAME}",'Nokia SIP') else: - data.replace("{NAME}",args['provName']) - + data = data.replace("{NAME}",args['provName']) + if args['port'] is None: - data.replace("{PORT}",str(5060)) + data = data.replace("{PORT}",str(5060)) proxyport = 5060 else: - data.replace("{PORT}",args['port']) + data = data.replace("{PORT}",args['port']) proxyport = args['port'] if args['proxy'] is None: - data.replace("{REGISTRAR}",args['server']) + data = data.replace("{REGISTRAR}",args['server']) else: - data.replace("{REGISTRAR}",args['proxy']) + data = data.replace("{REGISTRAR}",args['proxy']) if args['proxyPort'] is None: - data.replace("{REGISTRAR_PORT}",str(proxyport)) + data = data.replace("{REGISTRAR_PORT}",str(proxyport)) else: - data.replace("{REGISTRAR_PORT}",args['proxyPort']) + data = data.replace("{REGISTRAR_PORT}",args['proxyPort']) # This will give an option for "Service Homepage" on the phone if args['provURI'] is None: - data.replace("{PROV_URI}", 'http://projects.fnukhosting.net/nokiasip/prov.php?devicetype='+args['device']) + data = data.replace("{PROV_URI}", 'http://projects.fnukhosting.net/nokiasip/prov.php?devicetype='+args['device']) else: - data.replace("{PROV_URI}",args['provURI']) + data = data.replace("{PROV_URI}",args['provURI']) -data.replace("{DOMAIN}",args['server']) -data.replace("{USER}",args['username']) -data.replace("{PASSWORD}",args['password']) +data = data.replace("{DOMAIN}",args['server']) +data = data.replace("{USER}",args['username']) +data = data.replace("{PASSWORD}",args['password']) # prov = wbxml.xml_to_wbxml(data) @@ -86,4 +86,4 @@ else: outputFile = 'config.prov' prov = subprocess.Popen(["./libwbxml/bin/xml2wbxml", "-o"+outputFile, "-"], stdin=subprocess.PIPE, stdout=subprocess.PIPE) -prov = prov.communicate(input=bytes(data))[0] +prov = prov.communicate(input=bytes(data))[0] \ No newline at end of file