Introduce "update grom github" feature

Author: pocki80

wizard-run

@@ -2,7 +2,8 @@
 
 #
 # EdgeMAX Wizard "OLSRd_V1" created 03/2016 by Onetrix.net for FunkFeuer.at
-# Version [cpo0903e/20170317]
+# Version [cpo0903f/20170322]
+# ^-- previous line is used frombmk-webstatus-package as version identification, dont remove "Version "
 #
 # Github repository: https://github.com/vchrizz/ER-wizard-OLSRd_V1/
 #
@@ -63,6 +64,11 @@ olsrdmirror="http://ftp.de.debian.org/debian/pool/main/o/olsrd/olsrd_0.6.6.2-1_$
 olsrdplgmirror="http://ftp.de.debian.org/debian/pool/main/o/olsrd/olsrd-plugins_0.6.6.2-1_$arch.deb"
 olsrdsetupscriptfile="/config/scripts/post-config.d/olsrd_setup.sh"
 
+#define update sources on github
+gitowner="vchrizz"
+gitrepo="ER-wizard-OLSRd_V1"
+gitbranch="master"
+
 #
 # DO NOT EDIT BELOW HERE !
 #
@@ -19453,14 +19459,46 @@ load () {
     fi
     olsrd6plugins=$olsrd6plugins$olsrd6plgtxtinfo$olsrd6plgjsoninfo$olsrd6plghttpinfo
 
+    ####### wizard version check against github
+    # 
+    olsrdwizard=""
+    for i in $(find /config/wizard/feature/ -name wizard.html | grep -i olsr); do
+        if [[ $(head $i -n 10 | grep 'OLSRd_V1') ]]; then
+            olsrdwizard=$i
+            break
+        fi
+    done
+    if [ ! $olsrdwizard ]; then
+        updatetext="error: OLSRd_V1 wizard.html not found!" >>$log 2>>$log
+    else
+        CURRENTVERSION=$(head -n 8 $olsrdwizard | grep -i versioninfo= | awk -F"=" {'print $2'})
+        if [ $((onlinecheck)) = 0 ]; then
+            GITVERSION=$(curl -sL https://raw.githubusercontent.com/$gitowner/$gitrepo/$gitbranch/wizard.html | head -n 8 | grep -i versioninfo= | awk -F"=" {'print $2'})
+            if [ "$GITVERSION" ] && [ "$CURRENTVERSION" ]; then 
+                if [ $(($GITVERSION)) \> $(($CURRENTVERSION)) ]; then 
+                    updatetext="new version available: "$GITVERSION", current: "$CURRENTVERSION >>$log 2>>$log
+                else
+                    updatetext="current version "$CURRENTVERSION" is up-to-date" >>$log 2>>$log
+                fi
+            else
+                updatetext="version info not available. git:"$GITVERSION", current: "$CURRENTVERSION"." >>$log 2>>$log
+            fi
+        else
+            updatetext="version info not available. git:OFFLINE, current: "$CURRENTVERSION"." >>$log 2>>$log
+        fi
+    fi
+    updatestatus='"updatestatus":"'$updatetext'"'
+    # end
+    ####### wizard version check against github
+
     #
     # get all variables together for output
     #
     ipv4conf="$olsrd4enabled$olsrd4runonboot$olsrd4ip4broadcast$olsrd4hna$olsrd4lqmult$olsrd4plugins\"olsrd4config\":[$olsrd4interfaces]"
     #ipv6conf="$olsrd6enabled$olsrd6runonboot$olsrd6ip6multicastsite$olsrd6ip6multicastglobal$olsrd6hna$olsrd6lqmult\"olsrd6config\":[$olsrd6interfaces]"
     ipv6conf="$olsrd6enabled$olsrd6runonboot$olsrd6hna$olsrd6lqmult$olsrd6plugins\"olsrd6config\":[$olsrd6interfaces]"
     ###echo -n "{\"success\":\"1\",\"data\":{ \"olsrdstatus\":[{$olsrdpkgstatus,$olsrddaemonstatus}],$ipv4conf,$ipv6conf },"
-    echo -n "{\"success\":\"1\",\"data\":{ $olsrdpkgstatus,$olsrddaemonstatus,$olsrdsetupscript,$ipv4conf,$ipv6conf },"
+    echo -n "{\"success\":\"1\",\"data\":{ $olsrdpkgstatus,$olsrddaemonstatus,$olsrdsetupscript,$updatestatus,$ipv4conf,$ipv6conf },"
     #echo "\"definition\":{ \"olsrd4interface\":$ilist, \"ipv4address\":$ipv4list, \"olsrd6interface\":$ilist, \"ipv6address\":$ipv6list }}"
     echo "\"definition\":{ }}"
 }
@@ -19783,6 +19821,45 @@ ENDSCRIPTCONTENT
         fi
     fi
 
+    ####### wizard manual update from github
+    # update wizard from github
+    # load actual sources (ignoring releases)
+    updatefromgithub=$(jq -M -r '.updatefromgithub' $INPUT)
+    if [[ "$updatefromgithub" == "on" ]]; then
+        echo "update from github requested" >>$log 2>>$log
+        olsrdwizard=""
+        for i in $(find /config/wizard/feature/ -name wizard.html | grep -i olsr); do
+            if [[ $(head $i -n 10 | grep 'OLSRd_V1') ]]; then
+                olsrdwizard=$i
+                break
+            fi
+        done
+        if [ ! $olsrdwizard ]; then
+            echo "error: OLSRd_V1 wizard.html not found!" >>$log 2>>$log
+        elif [ $((onlinecheck)) != 0 ]; then
+            echo "currently offline" >>$log 2>>$log
+        else
+            curl -sL -o /tmp/ER-wizard-OLSRd_V1_latest.tar.gz --connect-timeout 2 https://api.github.com/repos/$gitowner/$gitrepo/tarball >>$log 2>>$log
+            tar   -xvzf /tmp/ER-wizard-OLSRd_V1_latest.tar.gz -C /tmp >/tmp/result.txt 2>>$log
+            rm -f       /tmp/ER-wizard-OLSRd_V1_latest.tar.gz >>$log 2>>$log
+            while read LINE; do
+              set $LINE
+              if [ $(basename $LINE) == "wizard-run" ] || [ $(basename $LINE) == "wizard.html" ] || [ $(basename $LINE) == "validator.json" ]; then W=1; else W=2; fi
+              [ -f "/tmp/"$LINE ] && [ $W == "1" ] && cp "/tmp/"$LINE $(dirname $olsrdwizard)"/"$(basename $LINE) >>$log 2>>$log
+            done < /tmp/result.txt
+            rm /tmp/result.txt >>$log 2>>$log
+            rm -Rf /tmp/$gitowner-$gitrepo* >>$log 2>>$log
+            chmod 755 $(dirname $olsrdwizard)"/"wizard-run >>$log 2>>$log
+            # before current WebGui session will break due to olsrd-install/restart, send success to browser
+            echo "{\"success\":\"1\"}"
+            ret="99"
+            $(dirname $olsrdwizard)"/"wizard-run load >>$log 2>>$log
+            echo "EdgeMAX OLSRd_V1 Wizard stopped $(date +%H:%M:%S.%N)" >> $log
+        fi
+    fi
+    # end
+    ####### wizard manual update from github
+
     olsrdrestartnow=$(jq -M -r '.olsrdrestartnow' $INPUT)
     olsrdrestart6now=$(jq -M -r '.olsrdrestart6now' $INPUT)
     if [[ "$olsrdrestartnow" == "on" ]]; then
@@ -19797,7 +19874,12 @@ ENDSCRIPTCONTENT
     # for debugging purposes
     cp $INPUT /tmp/result.json
 
-    echo '{"success":"1"}'
+    if [ "$ret" == "99" ]; then
+        echo "result already sent, so do nothing here" >/dev/null
+    else
+        echo '{"success":"1"}'
+    fi
+
 }
 
 case "$ACTION" in

wizard.html

@@ -1,8 +1,9 @@
 <!--
 
 EdgeMAX Wizard "OLSRd_V1" created 03/2016 by Onetrix.net for FunkFeuer.at
-
 Works on EdgeRouter and EdgeRouter X / X-SFP (system version 1.7.0+)
+versioninfo=201703220
+^-- use version identifier as number: YYYYMMDDX whereas X can be intraday-version
 
 -->
 <div class="instructions">
@@ -12,13 +13,15 @@ <h3>Optimized Link State Routing Protocol</h3>
 </div>
 <legend style="position:absolute;right:0px;padding:5px;">
     <center>EdgeMAX Wizard "OLSRd_V1" created 2016<br>by <a href="http://onetrix.net" target="_blank">Onetrix.net</a> for <a href="http://funkfeuer.at" target="_blank">FunkFeuer.at</a>
-    <br>Version [cpo0903e/20170317]</center>
+    <br>Version [cpo0903f/20170322]</center>
 </legend>
 <div style="padding:15px;border: 1px solid lightgray;width:648px">
   <table border="0">
     <tr><td style="vertical-align:middle">Package Status:</td><td><input style="right:10px" id="pkgstatus" name="pkgstatus" type="text" size="80" disabled /></td></tr>
     <tr><td style="vertical-align:middle">Daemon Status:</td><td><input style="right:10px" id="daemonstatus" name="daemonstatus" type="text" size="80" disabled /></td></tr>
+    <tr><td style="vertical-align:middle">Update Info:</td><td><input style="right:10px" id="updatestatus" name="updatestatus" type="text" size="80" disabled /></td></tr>
     <tr><td><div><span><input id="olsrdsetupscript" name="olsrdsetupscript" type="checkbox" />&nbsp;</span></div><div><span class="text" data-infotip='When updating the Firmware, OLSR package gets lost (only data from /config/ directory will be copied over to newly installed system). Enable this Setup-Script to install and setup OLSRd with your current running-configuration after a Firmware upgrade. WARNING: DO NOT remove OLSRd Wizard if Setup-Script is enabled because it uses functions from this Wizard for setup.'>Setup Script</span></div></td></tr>
+    <tr><td><div><span><input id="updatefromgithub" name="updatefromgithub" type="checkbox" />&nbsp;</span></div><div><span class="text" data-infotip='When checken, the wizard will download and install the current version from github. During this process, olsr daemons will update and restart as well - this will interupt current connections for a couple of seconds. You need to refresh the EdgeRouter WebUI afterwards, as the browser session will need a restart.'>Upgrade Wizard on 'Apply'.</span></div></td></tr>
   </table>
 </div>
 <fieldset id="ipv4olsrd" name="ipv4olsrd" class="primary expanded">
@@ -201,6 +204,16 @@ <h3>Optimized Link State Routing Protocol</h3>
         input.style.color = "green";
         enable();
     }
+    var input = document.getElementById('updatestatus');
+    input.style.color = "black";
+    document.getElementById('updatefromgithub').disabled = true;
+    if (input.value.match(/new version available/)) {
+        document.getElementById('updatefromgithub').disabled = false;
+        input.style.color = "red";
+    } else if (input.value.match(/up-to-date/)) {
+        input.style.color = "green";
+    } 
+    document.getElementById('updatestatus').disabled = true;
 }
 document.onsubmit=function(){
     var input = document.getElementById('pkgstatus');
@@ -211,5 +224,7 @@ <h3>Optimized Link State Routing Protocol</h3>
     }
     document.getElementById('pkgstatus').disabled = true;
     document.getElementById('daemonstatus').disabled = true;
+    document.getElementById('updatefromgithub').disabled = true;
+    document.getElementById('updatestatus').disabled = true;
 }
 </script>