diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 43947d334..9d6720141 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -21,7 +21,7 @@ jobs: - name: Install dependencies run: | ./setup.sh --user - ./setup-test-tools.sh --user + ./setup-dev.sh --user sudo snap install shfmt - name: Run linters diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ea2ac90ee..edced7163 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -20,7 +20,7 @@ jobs: - name: Install dependencies run: | ./setup.sh --user - ./setup-test-tools.sh --user + ./setup-dev.sh --user pip install --user coveralls - name: Python version info diff --git a/DEVELOPING.md b/DEVELOPING.md index 827e6656c..f5e306e89 100644 --- a/DEVELOPING.md +++ b/DEVELOPING.md @@ -1,6 +1,6 @@ # Environment setup -After installing `pwndbg` by running `setup.sh`, you additionally need to run `./setup-test-tools.sh` to install the necessary development dependencies. +After installing `pwndbg` by running `setup.sh`, you additionally need to run `./setup-dev.sh` to install the necessary development dependencies. If you would like to use Docker, you can create a Docker image with everything already installed for you. To do this, run the following command: ```bash diff --git a/Dockerfile b/Dockerfile index d335f5cc6..02715de6e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,8 +33,8 @@ RUN sed -i "s/^git submodule/#git submodule/" ./setup.sh && \ DEBIAN_FRONTEND=noninteractive ./setup.sh # Comment these lines if you won't run the tests. -ADD ./setup-test-tools.sh /pwndbg/ -RUN ./setup-test-tools.sh +ADD ./setup-dev.sh /pwndbg/ +RUN ./setup-dev.sh RUN echo "source /pwndbg/gdbinit.py" >> ~/.gdbinit.py && \ echo "PYTHON_MINOR=$(python3 -c "import sys;print(sys.version_info.minor)")" >> /root/.bashrc && \ diff --git a/setup-test-tools.sh b/setup-dev.sh similarity index 100% rename from setup-test-tools.sh rename to setup-dev.sh