Browse Source

Panel - FW manual update fix

DSR! 3 years ago
parent
commit
c9aeba40ba

+ 1 - 1
src/pineapple/modules/Advanced/api/module.php

@@ -306,7 +306,7 @@ class Advanced extends SystemModule
         @unlink("/tmp/upgradeDownloaded");
 
         $url = escapeshellarg($this->request->manualUpgradeUrl);
-        $this->execBackground("wget '{$url}' -O {$uploadPath} && touch /tmp/upgradeDownloaded");
+        $this->execBackground("wget {$url} -O {$uploadPath} && touch /tmp/upgradeDownloaded");
 
         $this->response = array('success' => true);
     }

+ 4 - 1
src/pineapple/modules/Advanced/js/module.js

@@ -231,13 +231,16 @@ registerController("AdvancedUpgradeController", ['$api', '$scope', '$interval',
         );
         if (isValid === null) {
             $scope.showManualUpgradeUrlError = true;
-            $timeout(function(){
+            $interval(function(){
                 $scope.showManualUpgradeUrlError = false;
             }, 2000);
             return;
         }
 
+        $scope.downloading = false;
+        $scope.downloaded = false;
         $scope.isManualUpgrade = true;
+
         $api.request({
             module: 'Advanced',
             action: 'downloadManualUpgrade',