From f85c88e63f6ce27432339f5e5de5e82e8bc61a02 Mon Sep 17 00:00:00 2001 From: Nebula Date: Tue, 27 Sep 2022 21:33:46 -0400 Subject: [PATCH] _kill_if_running --- palera1n.sh | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/palera1n.sh b/palera1n.sh index c3cd808..7053d3c 100755 --- a/palera1n.sh +++ b/palera1n.sh @@ -115,13 +115,22 @@ _dfuhelper() { echo "[*] Device entered DFU!" } +_kill_if_running() { + if (pgrep -u root -xf "$1" &> /dev/null > /dev/null); then + # yes, it's running as root. kill it + sudo killall $1 + else + if (pgrep -x "$1" &> /dev/null > /dev/null); then + killall $1 + fi + fi +} + _usb_fix() { if [ "$os" = 'Linux' ]; then - killall iproxy &> /dev/null - sudo killall iproxy &> /dev/null + _kill_if_running iproxy sudo systemctl stop usbmuxd &> /dev/null >> "$out" - killall usbmuxd &> /dev/null - sudo killall usbmuxd &> /dev/null + _kill_if_running usbmuxd sudo usbmuxd -f -p &> /dev/null >> "$out" & fi }