fix cwmp reset for TIM

update macoers feeds URL
avoid samefile cp error during first install

Author: FrancYescO

decompressed/gui_file/etc/modgui_scripts/02_specific.sh

@@ -71,14 +71,14 @@ src/gz chaos_calmer_telephony https://raw.githubusercontent.com/Ansuel/GUI_ipk/k
 src/gz chaos_calmer_core https://raw.githubusercontent.com/Ansuel/GUI_ipk/kernel-4.1/target/packages
 EOF
       fi
+      sed -i '/repository\/homeware\/18\/brcm63xx-tch/d' /etc/opkg.conf #remove old setted feeds
       if ! grep -q "homeware/18/brcm63xx-tch" $opkg_file; then
         cat <<EOF >>$opkg_file
-src/gz chaos_calmer_base_macoers https://www.macoers.com/repository/homeware/18/brcm63xx-tch/VANTW/base
-src/gz chaos_calmer_packages_macoers https://www.macoers.com/repository/homeware/18/brcm63xx-tch/VANTW/packages
-src/gz chaos_calmer_luci_macoers https://www.macoers.com/repository/homeware/18/brcm63xx-tch/VANTW/luci
-src/gz chaos_calmer_routing_macoers https://www.macoers.com/repository/homeware/18/brcm63xx-tch/VANTW/routing
-src/gz chaos_calmer_telephony_macoers https://www.macoers.com/repository/homeware/18/brcm63xx-tch/VANTW/telephony
-src/gz chaos_calmer_core_macoers https://www.macoers.com/repository/homeware/18/brcm63xx-tch/VANTW/target/packages
+src/gz chaos_calmer_base_macoers https://repository.macoers.com/homeware/18/brcm63xx-tch/VANTW/base
+src/gz chaos_calmer_packages_macoers https://repository.macoers.com/homeware/18/brcm63xx-tch/VANTW/packages
+src/gz chaos_calmer_luci_macoers https://repository.macoers.com/homeware/18/brcm63xx-tch/VANTW/luci
+src/gz chaos_calmer_routing_macoers https://repository.macoers.com/homeware/18/brcm63xx-tch/VANTW/routing
+src/gz chaos_calmer_telephony_macoers https://repository.macoers.com/homeware/18/brcm63xx-tch/VANTW/telephony
 EOF
       fi
       ;;

decompressed/gui_file/etc/modgui_scripts/04_config.sh

@@ -305,7 +305,7 @@ mobiled_lib_add() {
   fi
 
   if [ -f /rom/usr/lib/lua/libat/huawei.lua ]; then
-    cp /rom/usr/lib/lua/libat/huawei.lua /usr/lib/lua/libat/huawei.lua
+    cmp -s /rom/usr/lib/lua/libat/huawei.lua /usr/lib/lua/libat/huawei.lua || cp /rom/usr/lib/lua/libat/huawei.lua /usr/lib/lua/libat/huawei.lua
     grep -q "1003" /usr/lib/lua/libat/huawei.lua || sed -i '/^.*or device.pid == "1c05" then -- E173/i or device.pid == "1003" -- E156G E17X' /usr/lib/lua/libat/huawei.lua
   fi
 

decompressed/gui_file/usr/share/transformer/commitapply/uci_modgui.ca

@@ -1,3 +1,4 @@
 ^modgui%..+%.autoupgrade /usr/share/transformer/scripts/upgradegui SetTime
 ^modgui%..+%.autoupgrade_hour /usr/share/transformer/scripts/upgradegui SetTime
-^modgui%.var%.isp /usr/share/transformer/scripts/ispConfighelper.sh force
+^modgui%.var%.isp /usr/share/transformer/scripts/ispConfighelper.sh force
+^versioncusto /etc/init.d/transformer restart

decompressed/gui_file/usr/share/transformer/scripts/ispConfigHelper.sh

@@ -245,9 +245,11 @@ setup_ISP() {
     uci set cwmpd.cwmpd_config.acs_user="technicolor"
     uci set cwmpd.cwmpd_config.acs_pass="techn_tr69@"
     uci commit cwmpd
+    [ "$(uci get -q mmpbxrvsipnet.sip_net.user_param_value)" ] && uci del mmpbxrvsipnet.sip_net.user_param_value
     ;;
   Fastweb)
     check_clean Fastweb
+    [ "$(uci get -q mmpbxrvsipnet.sip_net.user_param_value)" ] && uci del mmpbxrvsipnet.sip_net.user_param_value
     firewall_specific_sip_rules_FASTWEB
     cwmp_specific_FASTWEB
     ;;
@@ -260,6 +262,7 @@ setup_ISP() {
       uci set dhcp.dnsmasq.server='151.99.125.1'
       restart_dnsmasq=1
     fi
+    [ ! "$(uci get -q mmpbxrvsipnet.sip_net.user_param_value)" ] && uci set mmpbxrvsipnet.sip_net.user_param_value=phone
     ;;
   Other)
     check_clean Other

decompressed/gui_file/usr/share/transformer/scripts/resetUtility.sh

@@ -95,6 +95,7 @@ resetConfig() {
 resetCwmp() {
 	[ "$(pgrep "cwmpd")" ] && /etc/init.d/cwmpd stop
 	[ -f /etc/cwmpd.db ] && rm /etc/cwmpd.db
+	[ "$(uci get -q env.var.provisioning_code)" ] && uci del env.var.provisioning_code
 	/etc/init.d/cwmpd start
 }