diff --git a/example_module/__init__.py b/example_module/__init__.py index 052189d..53a5dea 100644 --- a/example_module/__init__.py +++ b/example_module/__init__.py @@ -62,5 +62,5 @@ class Shell1604(ShellExample): """ BUILD_IMAGE = "pwncollege/pwnshop-builder:ubuntu1604" - BUILD_DEPENDENCIES = "libcapstone-dev" + BUILD_DEPENDENCIES = [ "libcapstone-dev" ] PIN_LIBRARIES = True diff --git a/pwnshop/challenge.py b/pwnshop/challenge.py index e686da5..b5281a9 100644 --- a/pwnshop/challenge.py +++ b/pwnshop/challenge.py @@ -57,9 +57,10 @@ class Challenge: EXEC_STACK = False STRIP = False DEBUG_SYMBOLS = False - LINK_LIBRARIES = [] + BUILD_IMAGE = None - BUILD_DEPENDENCIES = "" + BUILD_DEPENDENCIES = [] + LINK_LIBRARIES = [] PIN_LIBRARIES = False @@ -315,7 +316,7 @@ def _containerized_build(self, cmd): detach=True, volumes = {self.work_dir : {'bind': self.work_dir, 'mode': 'rw'}} ) - ret, out = container.exec_run(f'/bin/bash -c "apt-get update && apt-get install -y gcc patchelf {self.BUILD_DEPENDENCIES} && mkdir -p /tmp/pwnshop"') + ret, out = container.exec_run(f'/bin/bash -c "apt-get update && apt-get install -y gcc patchelf {" ".join(self.BUILD_DEPENDENCIES)} && mkdir -p /tmp/pwnshop"') if ret != 0: print("DEPENDENCY INSTALL ERROR:") print(out.decode('latin1'))