More changes for ipwndfu python2

This commit is contained in:
LukeZGD 2023-01-22 14:28:52 +08:00
parent 75348d8cbd
commit 5321303719

View File

@ -831,6 +831,11 @@ device_ipwndfu() {
local mac_ver=0 local mac_ver=0
local python2=$(which python2 2>/dev/null) local python2=$(which python2 2>/dev/null)
if [[ $1 == "send_ibss" ]]; then
patch_ibss
cp pwnediBSS ../resources/ipwndfu/
fi
if [[ $platform == "macos" ]]; then if [[ $platform == "macos" ]]; then
mac_ver=$(echo "$platform_ver" | cut -c -2) mac_ver=$(echo "$platform_ver" | cut -c -2)
fi fi
@ -838,10 +843,14 @@ device_ipwndfu() {
python2=/usr/bin/python python2=/usr/bin/python
elif [[ -e ~/.pyenv/versions/2.7.18/bin/python2 ]]; then elif [[ -e ~/.pyenv/versions/2.7.18/bin/python2 ]]; then
log "python2 from pyenv detected" log "python2 from pyenv detected"
python2=~/.pyenv/versions/2.7.18/bin/python2 python2=
if [[ $device_sudoloop == 1 ]]; then
python2="sudo "
fi
python2+="~/.pyenv/versions/2.7.18/bin/python2"
elif [[ -z $python2 ]]; then elif [[ -z $python2 ]]; then
error "Python 2 is not installed, cannot continue. Make sure to have python2 installed to use ipwndfu." \ error "Python 2 is not installed, cannot continue. Make sure to have python2 installed to use ipwndfu." \
"You may install python2 from pyenv: pyenv install 2.7.18" "* You may install python2 from pyenv: pyenv install 2.7.18"
fi fi
device_enter_mode DFU device_enter_mode DFU
@ -851,11 +860,6 @@ device_ipwndfu() {
mv ../resources/ipwndfu*/ ../resources/ipwndfu/ mv ../resources/ipwndfu*/ ../resources/ipwndfu/
fi fi
if [[ $1 == "send_ibss" ]]; then
patch_ibss
cp pwnediBSS ../resources/ipwndfu/ 2>/dev/null
fi
pushd ../resources/ipwndfu/ pushd ../resources/ipwndfu/
case $1 in case $1 in
"send_ibss" ) "send_ibss" )