From a814869753a3f5bdd2488908c5208a282acc2e63 Mon Sep 17 00:00:00 2001 From: nyuware Date: Thu, 4 Jan 2024 09:23:28 +0100 Subject: [PATCH] chore(doc): fix documentation inconsistencies and missing dependencies --- docs/development.md | 2 +- docs/installation.md | 6 +++--- unblob/install-deps.sh | 9 +++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/docs/development.md b/docs/development.md index 74df655dcc..30229e3496 100644 --- a/docs/development.md +++ b/docs/development.md @@ -95,7 +95,7 @@ dependencies. To install all required dependencies for development, you can run the following command: ``` -poetry install --with dev +poetry install --with dev --all-extras ``` Please note that it installs dependencies within the dedicated virtual diff --git a/docs/installation.md b/docs/installation.md index 9a5229dda0..21682b3213 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -128,7 +128,7 @@ There is a handy `install-deps.sh` script included in the repository and PyPI pa 1. With your operating system package manager: On Ubuntu 22.04, install extractors with APT: - sudo apt install android-sdk-libsparse-utils e2fsprogs p7zip-full unar zlib1g-dev liblzo2-dev lzop lziprecover libhyperscan-dev zstd lz4 + sudo apt install android-sdk-libsparse-utils e2fsprogs p7zip-full unar zlib1g-dev liblzo2-dev lzop lziprecover libhyperscan-dev zstd lz4 srecord 2. If you need **squashfs support**, install sasquatch: @@ -139,9 +139,9 @@ There is a handy `install-deps.sh` script included in the repository and PyPI pa 4. We maintain a fork of e2fsprogs based on Debian upstream, with some security fixes. You can install it this way: curl -L -o libext2fs2_1.47.0-3.ok1.deb "https://github.com/onekey-sec/e2fsprogs/releases/download/v1.47.0-3.ok1/libext2fs2_1.47.0-3.ok1_$(dpkg --print-architecture).deb" - dpkg -i libext2fs2_1.47.0-3.ok1.deb + sudo dpkg -i libext2fs2_1.47.0-3.ok1.deb rm -f libext2fs2_1.47.0-3.ok1.deb curl -L -o e2fsprogs_1.47.0-3.ok1.deb "https://github.com/onekey-sec/e2fsprogs/releases/download/v1.47.0-3.ok1/e2fsprogs_1.47.0-3.ok1_$(dpkg --print-architecture).deb" - dpkg -i e2fsprogs_1.47.0-3.ok1.deb + sudo dpkg -i e2fsprogs_1.47.0-3.ok1.deb rm -f e2fsprogs_1.47.0-3.ok1.deb diff --git a/unblob/install-deps.sh b/unblob/install-deps.sh index d9f0d88a67..7b5277f17e 100755 --- a/unblob/install-deps.sh +++ b/unblob/install-deps.sh @@ -12,16 +12,17 @@ apt-get install --no-install-recommends -y \ unar \ xz-utils \ libmagic1 \ - zstd + zstd \ + srecord curl -L -o sasquatch_1.0.deb "https://github.com/onekey-sec/sasquatch/releases/download/sasquatch-v4.5.1-4/sasquatch_1.0_$(dpkg --print-architecture).deb" -dpkg -i sasquatch_1.0.deb +sudo dpkg -i sasquatch_1.0.deb rm -f sasquatch_1.0.deb curl -L -o libext2fs2_1.47.0-3.ok1.deb "https://github.com/onekey-sec/e2fsprogs/releases/download/v1.47.0-3.ok1/libext2fs2_1.47.0-3.ok1_$(dpkg --print-architecture).deb" -dpkg -i libext2fs2_1.47.0-3.ok1.deb +sudo dpkg -i libext2fs2_1.47.0-3.ok1.deb rm -f libext2fs2_1.47.0-3.ok1.deb curl -L -o e2fsprogs_1.47.0-3.ok1.deb "https://github.com/onekey-sec/e2fsprogs/releases/download/v1.47.0-3.ok1/e2fsprogs_1.47.0-3.ok1_$(dpkg --print-architecture).deb" -dpkg -i e2fsprogs_1.47.0-3.ok1.deb +sudo dpkg -i e2fsprogs_1.47.0-3.ok1.deb rm -f e2fsprogs_1.47.0-3.ok1.deb