diff --git a/back/pialert.py b/back/pialert.py index 61944dc8..f9f59b28 100644 --- a/back/pialert.py +++ b/back/pialert.py @@ -590,14 +590,14 @@ def save_scanned_devices (p_arpscan_devices, p_cycle_interval): # local_mac_cmd = ["bash -lc ifconfig `ip route list default | awk {'print $5'}` | grep ether | awk '{print $2}'"] # local_mac_cmd = ["/sbin/ifconfig `ip route list default | sort -nk11 | head -1 | awk {'print $5'}` | grep ether | awk '{print $2}'"] local_mac_cmd = ["/sbin/ifconfig `ip -o route get 1 | sed 's/^.*dev \\([^ ]*\\).*$/\\1/;q'` | grep ether | awk '{print $2}'"] - local_mac = subprocess.Popen (local_mac_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT).communicate()[0].strip() + local_mac = subprocess.Popen (local_mac_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT).communicate()[0].decode().strip() # local_dev_cmd = ["ip -o route get 1 | sed 's/^.*dev \\([^ ]*\\).*$/\\1/;q'"] - # local_dev = subprocess.Popen (local_dev_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT).communicate()[0].strip() + # local_dev = subprocess.Popen (local_dev_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT).communicate()[0].decode().strip() # local_ip_cmd = ["ip route list default | awk {'print $7'}"] local_ip_cmd = ["ip -o route get 1 | sed 's/^.*src \\([^ ]*\\).*$/\\1/;q'"] - local_ip = subprocess.Popen (local_ip_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT).communicate()[0].strip() + local_ip = subprocess.Popen (local_ip_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT).communicate()[0].decode().strip() sql.execute ("INSERT INTO CurrentScan (cur_ScanCycle, cur_MAC, cur_IP, cur_Vendor, cur_ScanMethod) "+ "VALUES ( ?, ?, ?, Null, 'local_MAC') ", (cycle, local_mac, local_ip) ) diff --git a/install/pialert_install.sh b/install/pialert_install.sh index 9518f2f8..2261ce5f 100644 --- a/install/pialert_install.sh +++ b/install/pialert_install.sh @@ -24,7 +24,7 @@ LOG="pialert_install_`date +"%Y-%m-%d_%H-%M"`.log" # MAIN_IP=`ip -o route get 1 | sed -n 's/.*src \([0-9.]\+\).*/\1/p'` - MAIN_IP=`ip -o route get 1 | sed -n 's/^.*src \([^ ]*\).*$/\1/;q'` + MAIN_IP=`ip -o route get 1 | sed 's/^.*src \([^ ]*\).*$/\1/;q'` PIHOLE_INSTALL=false PIHOLE_ACTIVE=false @@ -521,7 +521,7 @@ test_pialert() { if $FIRST_SCAN_KNOWN ; then echo "" print_msg "- Set devices as Known devices..." - sqlite3 $PIALERT_HOME/db/pialert.db "UPDATE Devices SET dev_NewDevice=0, dev_AlertEvents=0" 2>&1 >> "$LOG" + sqlite3 $PIALERT_HOME/db/pialert.db "UPDATE Devices SET dev_NewDevice=0, dev_AlertEvents=0 WHERE dev_NewDevice=1" 2>&1 >> "$LOG" fi } diff --git a/tar/pialert_3.01.tar b/tar/pialert_3.01.tar index 668f2ffd..3c6871a1 100644 Binary files a/tar/pialert_3.01.tar and b/tar/pialert_3.01.tar differ diff --git a/tar/pialert_latest.tar b/tar/pialert_latest.tar index 668f2ffd..3c6871a1 100644 Binary files a/tar/pialert_latest.tar and b/tar/pialert_latest.tar differ