Fixed pw.cgi

Fixed updater.sh

Author: Invers3

etc/init.d/pw

@@ -74,4 +74,11 @@ stop() {
         kill $pid
     done
 
+}
+
+update() {
+    
+    /tmp/updater.sh
+    wait
+
 }

www/assets/js/main.js

@@ -119,8 +119,6 @@ var appView = Backbone.View.extend({
                 ]}));
             });
 
-            
-
         },
         'click button#pppoe_pw': function(){
 
@@ -156,21 +154,14 @@ var appView = Backbone.View.extend({
             });
 
         },
-        'click button#restart_http': function(event){
+        'click button#updater_rep': function(event){
+
+            var self = this;
 
             $.modal(function(modal){
-                modal.content($('<div class="preloader center"></div>'));
-            });
-            this.model.fetch({
-                method: 'POST',
-                data: {
-                    task:'restartHttp',
-                    token:this.webToken
-                }
-            }).then(function(res){
-                $.modal.close();
-            }).catch(function(err){
-                $.modal.close();
+                modal.content(self.templates.msg({message: 'Update PPPwn OpenWrt?', buttons: [
+                    {label:"Yes, Install update", id: "update_rep", onclick:"appweb.update()"}
+                ]}));
             });
 
         },
@@ -377,14 +368,12 @@ var appView = Backbone.View.extend({
             data: {
                 task:'update',
                 token:this.webToken
-            },
-            success: this.state.bind(this)
-        }).then(function(){
+            }
+        }).then(function(response){
+            location.assign("/pppwn.html")
             document.cookie = 'token=; path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT;';
-            $.modal.close();
         }).catch(function(err){
             $.modal.content(self.templates.msg({message: err.statusText, buttons:[]}));
-            location.assign("/");
         });
 
     },
@@ -447,14 +436,6 @@ var appView = Backbone.View.extend({
 
         var self = this, interfaces = [], data = response.toJSON();
 
-        if(data.update){
-            $.modal.content(self.templates.msg({message: 'Update available.<br>Click in continue to update.', buttons:[
-                {label:"Yes, continue", id: "update_rep", onclick:"appweb.update()"}
-            ]}));
-        }else{
-            $.modal.close();
-        }
-
         if (this.model.get('stored_token')) {
             document.cookie = 'token=; path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT;';
             this.cookie('token', this.model.get('stored_token'));
@@ -523,6 +504,8 @@ var appView = Backbone.View.extend({
                 modal.content(self.templates.msg({message: 'TheOfficialFloW / SiSTR0 / xfangfang', buttons:[]}));
             });
         });
+
+        $.modal.close();
 
         return this;
     },

www/cgi-bin/pw.cgi

@@ -189,7 +189,10 @@ case "$task" in
         echo "\"path\":\"$(uci get pw.@params[0].path)\","
 
         if [ "$latest_version" -gt "$current_version" ]; then
-            "$(wget -O /tmp/updater.sh https://raw.githubusercontent.com/CodeInvers3/codeinvers3.github.io/refs/heads/master/files/updater.sh)"
+            if ! [ -f /tmp/updater.sh ]; then
+                "$(wget -O /tmp/updater.sh https://raw.githubusercontent.com/CodeInvers3/codeinvers3.github.io/refs/heads/master/files/updater.sh)"
+                chmod +x /tmp/updater.sh
+            fi
             echo "\"update\":true,"
         else
             echo "\"update\":false,"
@@ -353,10 +356,11 @@ case "$task" in
         echo "Content-Type: application/json"
         echo ""
 
-        /tmp/updater.sh
+        #/etc/init.d/pw update
+        "$(/tmp/updater.sh)"
         wait
-        
-        echo "{\"output\":\"Update completed\"}"
+
+        echo "{\"output\":\"Updated!\"}"
 
         exit 0
 

www/pppwn.html

@@ -102,6 +102,9 @@
                                             <button type="button" id="pppoe_pw" class="btn-form input-attach sec-auto">PPPoe Start</button>
                                         <% } %>
                                         <button type="button" id="remove_rep" class="btn-form input-attach sec-auto">Uninstall</button>
+                                        <% if(update){ %>
+                                        <button type="button" id="updater_rep" class="btn-form input-attach sec-auto">Update</button>
+                                        <% } %>
                                     </div>
                                 </div>
                             </fieldset>