Эх сурвалжийг харах

Changes for reflash support

DSR! 3 жил өмнө
parent
commit
83930e22bf

+ 0 - 0
src/pineapple/fix-executables.sh → fix-executables.sh


+ 3 - 3
src/pineapple/api/Setup.php

@@ -57,9 +57,9 @@ class Setup extends APIModule
 
 
     private function getChanges()
     private function getChanges()
     {
     {
-        if (file_exists("/etc/pineapple/changes")) {
-            $changes = file_get_contents("/etc/pineapple/changes");
-            $version = trim(file_get_contents('/etc/pineapple/pineapple_version'));
+        if (file_exists("/pineapple/changes")) {
+            $changes = file_get_contents("/pineapple/changes");
+            $version = trim(file_get_contents('/pineapple/pineapple_version'));
             $this->response = array('changes' => $changes, 'fwversion' => $version);
             $this->response = array('changes' => $changes, 'fwversion' => $version);
         } else {
         } else {
             $this->response = array('changes' => NULL);
             $this->response = array('changes' => NULL);

+ 1 - 1
src/pineapple/api/pineapple.php

@@ -112,7 +112,7 @@ function downloadFile($file)
 
 
 function getFirmwareVersion()
 function getFirmwareVersion()
 {
 {
-    return trim(file_get_contents('/etc/pineapple/pineapple_version'));
+    return trim(file_get_contents('/pineapple/pineapple_version'));
 }
 }
 
 
 function getDevice()
 function getDevice()

+ 0 - 0
src/etc/pineapple/changes → src/pineapple/changes


+ 1 - 1
src/pineapple/modules/Help/files/debug

@@ -7,7 +7,7 @@ echo "Retrieving /proc/cpuinfo"
 echo "============CPUINFO========" > $LOG
 echo "============CPUINFO========" > $LOG
 cat /proc/cpuinfo >> $LOG
 cat /proc/cpuinfo >> $LOG
 echo "Retrieving firmware version"
 echo "Retrieving firmware version"
-echo -n "Firmware Version: " >> $LOG && cat /etc/pineapple/pineapple_version >> $LOG
+echo -n "Firmware Version: " >> $LOG && cat /pineapple/pineapple_version >> $LOG
 echo "Retrieving lsusb output"
 echo "Retrieving lsusb output"
 echo "=============LSUSB=========" >> $LOG
 echo "=============LSUSB=========" >> $LOG
 lsusb >> $LOG
 lsusb >> $LOG

+ 0 - 0
src/etc/pineapple/pineapple_version → src/pineapple/pineapple_version