diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap index 858ceb2..8bc2cc0 100755 --- a/.config/yadm/bootstrap +++ b/.config/yadm/bootstrap @@ -426,7 +426,7 @@ if $pwn; then alpine|fedora|debian|ubuntu|macos) packages_add radare2 testdisk socat nasm john binutils;; esac case $ID in - alpine|fedora|debian|ubuntu) packages_add file squashfs-tools;; + alpine|fedora|debian|ubuntu) packages_add file squashfs-tools strace;; macos) packages_add squashfs;; esac case $ID in diff --git a/.pwn/bin/binwalk b/.pwn/bin/binwalk index 0d6c626..c8af697 100755 --- a/.pwn/bin/binwalk +++ b/.pwn/bin/binwalk @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e @@ -15,6 +15,7 @@ if [[ ! -d "$BASE/bin" ]]; then popd fi -export PYTHONPATH="$BASE/lib/python3.9/site-packages:$PYTHONPATH" +pythonversion="$(python3 -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')" +export PYTHONPATH="$BASE/lib/python$pythonversion/site-packages:$PYTHONPATH" "$BASE/bin/binwalk" "$@"