From 8cb01cdd294584372a94cebb20ebfd6fea0adf0f Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Fri, 16 Dec 2016 15:08:30 -0800 Subject: [PATCH] One step to rename variables. Signed-off-by: Dan Schaper --- automated install/basic-install.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 8abf9af8..a04cac3f 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -915,13 +915,12 @@ accountForRefactor() { # At some point in the future this list can be pruned, for now we'll need it to ensure updates don't break. # Refactoring of install script has changed the name of a couple of variables. Sort them out here. - sed -i 's/IPv4addr/IPv4_address/g' ${setupVars} - sed -i 's/piholeIPv6/IPv6_address/g' ${setupVars} - # Account for renaming of global variables. sed -i 's/piholeInterface/PIHOLE_INTERFACE/g' ${setupVars} sed -i 's/IPv4_address/IPV4_ADDRESS/g' ${setupVars} + sed -i 's/IPv4addr/IPV4_ADDRESS/g' ${setupVars} sed -i 's/IPv6_address/IPV6_ADDRESS/g' ${setupVars} + sed -i 's/piholeIPv6/IPV6_ADDRESS/g' ${setupVars} sed -i 's/piholeDNS1/PIHOLE_DNS_1/g' ${setupVars} sed -i 's/piholeDNS2/PIHOLE_DNS_2/g' ${setupVars}