瀏覽代碼

Correct changes in debug and reporting

DSR! 2 年之前
父節點
當前提交
66e552a682

+ 1 - 1
src/pineapple/config.php

@@ -3,7 +3,7 @@
 class DeviceConfig
 {
     // third party modules can change the options based on this
-    // the allowed values are: 'nano' or 'tetra'
+    // the allowed values are: "nano" or "tetra"
     const DEVICE_TYPE = 'tetra';
 
     const USE_INTERNAL_STORAGE = true;

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

@@ -37,7 +37,7 @@ echo "============SURVEY=========" >> $LOG
 echo -e "\tEnsuring pineapd is started"
 (/etc/init.d/pineapd start 2>&1) >> $LOG
 scan_type=0
-cat /proc/cpuinfo | grep TETRA && scan_type=2
+cat /pineapple/config.php | grep "'tetra'" && scan_type=2
 echo -e "\tRunning scan type $scan_type for 15 seconds"
 (/usr/bin/pineap /tmp/pineap.conf run_scan 15 $scan_type 2>&1) >> $LOG
 sleep 2

+ 1 - 1
src/pineapple/modules/Reporting/files/reporting

@@ -52,7 +52,7 @@ getSiteReport() {
         sleep 3
         duration=$(uci get reporting.@settings[0].duration)
         scan_type=0
-        cat /proc/cpuinfo | grep TETRA && scan_type=2
+        cat /pineapple/config.php | grep "'tetra'" && scan_type=2
         echo -e "\tRunning scan type $scan_type for 15 seconds"
         (/usr/bin/pineap /tmp/pineap.conf run_scan $duration $scan_type 2>&1) >> /tmp/reporting.log
         sleep 2