From 2af9d1dd3809f7ce85b60a33af65970dbab36610 Mon Sep 17 00:00:00 2001 From: pucherot Date: Fri, 23 Apr 2021 13:54:25 +0200 Subject: [PATCH] Pi.Alert 3.01 #106 --- back/pialert.py | 6 +++--- install/pialert_install.sh | 4 ++-- tar/pialert_3.01.tar | Bin 58634240 -> 58634240 bytes tar/pialert_latest.tar | Bin 58634240 -> 58634240 bytes 4 files changed, 5 insertions(+), 5 deletions(-) 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 668f2ffd71ae2905d5242fc9353c1d9dcea05570..3c6871a11a499c0c0ea71ae0399a04d658e55856 100644 GIT binary patch delta 4405 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 d^J@*af>`5A20~upiRl z033uva2SrjQ8)(2;RKw7Q*av2z*#s4=ivfegiCN4uE15e2G`*R+=N?j8}7hexCi&) z0X&39@ED%JQ+Ni?;RU>e40r{v;SIcnckmuQz(@E5pWzF9g>Ud3e!x%o1;61B{Dpru zI)AnrY`_)_U!p1+;`#&>Gr6TWAOE zp#yY;Xy^o;p$l|{ZqOZiKu_oey&(qrKwszw{b2wMgh3DsgJB2^g<&uptS|ybLL7{O z(J%(a!Z;WY6JR1tg2^xirouFchXj}oiI4=zFau`7EJ%UbFbC$sJeUs)U?D7m#jpgH z!ZKJ6D_|w8g4M7F*1|ei4;x@3Y=X_O1-3#eq`@}W4m)5c?1J5}2lm1~*bnJ&01m<- zI1ESNC>(?1Z~{)kDL4&h;4GYj^Kbz!!X>y2SKumKgX?euZo)0N4R_!!+=Kh@03O04 zcnnYADLjMc@B&^!2E2mT@CM$(J9rNt;3Is3&+rAl!Z-L1Kj0_)g5U55{=z?7oj-#H z8?Xff*gg0&ge)KHv*} zP!I}1VJHIrP!x(maVP;Lp%j#cGGGJ~1VA8|AqXrG3}vAll!p+g02QGURE8>06{kae;5D*VGzW^U>E{JVVEIZ=g$xu>Tb3K{O?l{ z6cA(z)ThE?4hZ`HPsPINRzq5Pn$c=-Fr+w#y4$Dk540Mlh1mElN<3^exTVL&SPhfB X6MbBhY#kFE?7;3;?7;5s?!@la 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 d^J@*af>`5A20~upiRl z033uva2SrjQ8)(2;RKw7Q*av2z*#s4=ivfegiCN4uE15e2G`*R+=N?j8}7hexCi&) z0X&39@ED%JQ+Ni?;RU>e40r{v;SIcnckmuQz(@E5pWzF9g>Ud3e!x%o1;61B{Dpru zI)AnrY`_)_U!p1+;`#&>Gr6TWAOE zp#yY;Xy^o;p$l|{ZqOZiKu_oey&(qrKwszw{b2wMgh3DsgJB2^g<&uptS|ybLL7{O z(J%(a!Z;WY6JR1tg2^xirouFchXj}oiI4=zFau`7EJ%UbFbC$sJeUs)U?D7m#jpgH z!ZKJ6D_|w8g4M7F*1|ei4;x@3Y=X_O1-3#eq`@}W4m)5c?1J5}2lm1~*bnJ&01m<- zI1ESNC>(?1Z~{)kDL4&h;4GYj^Kbz!!X>y2SKumKgX?euZo)0N4R_!!+=Kh@03O04 zcnnYADLjMc@B&^!2E2mT@CM$(J9rNt;3Is3&+rAl!Z-L1Kj0_)g5U55{=z?7oj-#H z8?Xff*gg0&ge)KHv*} zP!I}1VJHIrP!x(maVP;Lp%j#cGGGJ~1VA8|AqXrG3}vAll!p+g02QGURE8>06{kae;5D*VGzW^U>E{JVVEIZ=g$xu>Tb3K{O?l{ z6cA(z)ThE?4hZ`HPsPINRzq5Pn$c=-Fr+w#y4$Dk540Mlh1mElN<3^exTVL&SPhfB X6MbBhY#kFE