Merge pull request #1 from OSPG/ci_cd_improvement

workflows: update python & ubuntu versions

.github/workflows/test.yml

@@ -12,20 +12,20 @@ jobs:
     strategy:
       matrix:
         os:
-          - ubuntu-18.04
           - ubuntu-20.04
+          - ubuntu-22.04
         python-version:
-          - '3.6'
-          - '3.7'
           - '3.8'
           - '3.9'
+          - '3.10'
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v4
         with:
           python-version: '${{ matrix.python-version }}'
           cache: pip
           cache-dependency-path: setup.py
+      - run: sudo apt-get update
       - run: ./deps.sh --yes
       - run: pip install coverage nose
       - run: python ./setup.py install

README.md

@@ -1,6 +1,6 @@
 # Binwalk
 
-![Build Status](https://github.com/ReFirmLabs/binwalk/actions/workflows/test/badge.svg)
+![Build Status](https://github.com/OSPG/binwalk/actions/workflows/test/badge.svg)
 [![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://GitHub.com/ReFirmLabs/binwalk/graphs/commit-activity)
 [![GitHub license](https://img.shields.io/github/license/ReFirmLabs/binwalk.svg)](https://github.com/ReFirmLabs/binwalk/blob/master/LICENSE)
 [![GitHub stars](https://img.shields.io/github/stars/badges/shields.svg?style=social&label=Stars)](https://github.com/ReFirmLabs/binwalk/stargazers)

deps.sh

@@ -84,7 +84,10 @@ function install_yaffshiv
 function install_sasquatch
 {
     git clone --quiet --depth 1 --branch "master" https://github.com/devttys0/sasquatch
-    (cd sasquatch && $SUDO ./build.sh)
+    (cd sasquatch &&
+        wget https://github.com/devttys0/sasquatch/pull/47.patch &&
+        patch -p1 < 47.patch &&
+        $SUDO ./build.sh)
     $SUDO rm -rf sasquatch
 }
 
@@ -112,14 +115,6 @@ function install_cramfstools
   rm -rf cramfs-tools
 }
 
-
-function install_ubireader
-{
-    git clone --quiet --depth 1 --branch "master" https://github.com/jrspruitt/ubi_reader
-    (cd ubi_reader && $SUDO $PYTHON setup.py install)
-    $SUDO rm -rf ubi_reader
-}
-
 function install_pip_package
 {
     PACKAGE="$1"
@@ -236,11 +231,10 @@ if [ $? -ne 0 ]
     echo "Package installation failed: $PKG_CANDIDATES"
     exit 1
 fi
-install_pip_package "setuptools matplotlib capstone pycryptodome gnupg tk"
+install_pip_package "setuptools matplotlib capstone pycryptodome gnupg tk ubi_reader"
 install_sasquatch
 install_yaffshiv
 install_jefferson
-install_ubireader
 
 if [ $distro_version = "18" ]
 then

setup.py

@@ -4,10 +4,7 @@
 import sys
 import shutil
 import subprocess
-try:
-    from setuptools import setup, Command
-except ImportError:
-    from distutils.core import setup, Command
+from setuptools import setup, Command, find_packages
 from distutils.dir_util import remove_tree
 
 MODULE_NAME = "binwalk"
@@ -299,7 +296,7 @@ def run(self):
     requires=[],
     python_requires=">=3",
     package_dir={"": "src"},
-    packages=setuptools.find_packages("src"),
+    packages=find_packages("src"),
     include_package_data=True,
     entry_points={
         'console_scripts': ['binwalk=binwalk.__main__:main'],