webui: Updated webs scripts to get firmware info from gnuton's github

release/src/router/rom/webs_scripts/merlin_webs_note.sh

@@ -26,7 +26,7 @@ else
 	echo "Merlin FW" >> /tmp/webs_note.log
 	releasenote_file=$(nvram get webs_state_info_am)_note.txt
 	releasenote_file_US=$releasenote_file
-	fwsite="https://fwupdate.asuswrt-merlin.net"
+	fwsite="https://gnuton.github.io/asuswrt-merlin.ng/updates"
 	fwsiteSQ=$fwsite"/test"
 fi
 	releasenote_path="/tmp/release_note.txt"

release/src/router/rom/webs_scripts/merlin_webs_update.sh

@@ -2,7 +2,7 @@
 
 wget_options="-q -t 2 -T 30"
 
-fwsite="https://fwupdate.asuswrt-merlin.net"
+fwsite="https://gnuton.github.io/asuswrt-merlin.ng/updates"
 
 nvram set webs_state_update=0 # INITIALIZING
 nvram set webs_state_flag=0   # 0: Don't do upgrade  1: Do upgrade
@@ -20,10 +20,10 @@ current_buildno=$(nvram get buildno | cut -d. -f2)
 current_extendno=$(nvram get extendno)
 
 # Overload extendno: alpha is 11-19, beta is 51-59, release is 100-109.
-current_extendno=$(echo $current_extendno | sed s/-g.*//;)
-current_extendno=$(echo $current_extendno | sed "s/^[0-9]$/10&/;")
-current_extendno=$(echo $current_extendno | sed s/^alpha/1/;)
-current_extendno=$(echo $current_extendno | sed s/^beta/5/;)
+#current_extendno=$(echo $current_extendno | sed s/-g.*//;)
+#current_extendno=$(echo $current_extendno | sed "s/^[0-9]$/10&/;")
+#current_extendno=$(echo $current_extendno | sed s/^alpha/1/;)
+#current_extendno=$(echo $current_extendno | sed s/^beta/5/;)
 
 # get firmware information
 forsq=$(nvram get apps_sq)
@@ -84,7 +84,7 @@ else
 					fi
 				fi
 		elif [ "$current_buildno" -eq "$buildno" ]; then
-			if [ "$current_extendno" -lt "$lextendno" ]; then
+			if [ "${current_extendno}" \< "${extendno}" ]; then
 				echo "---- lextendno: $lextendno ----" >> /tmp/webs_upgrade.log
 				nvram set webs_state_flag=1	# Do upgrade
 				if [ "$IS_SUPPORT_NOTIFICATION_CENTER" != "" ]; then