[package] fix update_url option handling (#6127), bump release number

SVN-Revision: 19009

diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile
index 53cb961f10a422c083d7e75d3ccaab13c450cb1c..b9f715d31b2bd8cd4f150a5dcabf3bec81f0f379 100644 (file)
--- a/net/ddns-scripts/Makefile
+++ b/net/ddns-scripts/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ddns-scripts
 PKG_VERSION:=1.0.0
 
 PKG_NAME:=ddns-scripts
 PKG_VERSION:=1.0.0

-PKG_RELEASE:=5
+PKG_RELEASE:=6

 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 

diff --git a/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh b/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh
index ed0396da9c980a75c8cfdeb08c3c2b46505f41bf..b7824326b4e8e8436be1a19e39a2abddf71508b6 100755 (executable)
--- a/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh
+++ b/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh
@@ -233,7 +233,7 @@ do
 
        current_time=$(date +%s)
        time_since_update=$(($current_time - $last_update))
 
        current_time=$(date +%s)
        time_since_update=$(($current_time - $last_update))

-       
+

 
        verbose_echo "Running IP check..."
        verbose_echo "current system ip = $current_ip"
 
        verbose_echo "Running IP check..."
        verbose_echo "current system ip = $current_ip"


@@ -248,13 +248,16 @@ do
                final_url=$update_url
                for option_var in $ALL_OPTION_VARIABLES
                do
                final_url=$update_url
                for option_var in $ALL_OPTION_VARIABLES
                do

-                       replace_name=$(echo "\[$option_var\]" | tr 'a-z' 'A-Z')
-                       replace_value=$(eval echo "\$$option_var")
-                       replace_value=$(echo $replace_value | sed -f /usr/lib/ddns/url_escape.sed)
-                       final_url=$(echo $final_url | sed s^"$replace_name"^"$replace_value"^g )
-               done    
+                       if [ "$option_var" != "update_url" ]
+                       then
+                               replace_name=$(echo "\[$option_var\]" | tr 'a-z' 'A-Z')
+                               replace_value=$(eval echo "\$$option_var")
+                               replace_value=$(echo $replace_value | sed -f /usr/lib/ddns/url_escape.sed)
+                               final_url=$(echo $final_url | sed s^"$replace_name"^"$replace_value"^g )
+                       fi
+               done

                final_url=$(echo $final_url | sed s/"\[IP\]"/"$current_ip"/g )
                final_url=$(echo $final_url | sed s/"\[IP\]"/"$current_ip"/g )

-               
+

 
                verbose_echo "updating with url=\"$final_url\""
 
 
                verbose_echo "updating with url=\"$final_url\""
 


@@ -270,10 +273,10 @@ do
                last_update=$current_time
                time_since_update='0'
                registered_ip=$current_ip
                last_update=$current_time
                time_since_update='0'
                registered_ip=$current_ip

-               
+

                human_time=$(date)
                verbose_echo "update complete, time is: $human_time"
                human_time=$(date)
                verbose_echo "update complete, time is: $human_time"

-               
+

                echo "$last_update" > "/var/run/dynamic_dns/$service_id.update"
        else
                human_time=$(date)
                echo "$last_update" > "/var/run/dynamic_dns/$service_id.update"
        else
                human_time=$(date)