From 9fe4c85cd81e3d84302f9404c62dbc15c9838133 Mon Sep 17 00:00:00 2001 From: Jacob Strieb <99368685+rbs-jacob@users.noreply.github.com> Date: Thu, 19 Oct 2023 22:46:50 -0400 Subject: [PATCH] Fix apktool and java CLI component check errors (#390) --- ofrak_core/CHANGELOG.md | 1 + ofrak_core/ofrak/core/apk.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ofrak_core/CHANGELOG.md b/ofrak_core/CHANGELOG.md index 718a3cd7a..30a222103 100644 --- a/ofrak_core/CHANGELOG.md +++ b/ofrak_core/CHANGELOG.md @@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ## [Unreleased](https://github.com/redballoonsecurity/ofrak/tree/master) ### Fixed - Improved flushing of filesystem entries (including symbolic links and other types) to disk. ([#373](https://github.com/redballoonsecurity/ofrak/pull/373)) +- Fix `java` and `apktool` CLI arguments for checking components. ([#390](https://github.com/redballoonsecurity/ofrak/pull/390)) ### Changed - `Resource.flush_to_disk` method renamed to `Resource.flush_data_to_disk`. ([#373](https://github.com/redballoonsecurity/ofrak/pull/373)) diff --git a/ofrak_core/ofrak/core/apk.py b/ofrak_core/ofrak/core/apk.py index 4a300db24..0e6acee84 100644 --- a/ofrak_core/ofrak/core/apk.py +++ b/ofrak_core/ofrak/core/apk.py @@ -22,11 +22,11 @@ from ofrak_type.range import Range -APKTOOL = ComponentExternalTool("apktool", "https://ibotpeaches.github.io/Apktool/", "--help") +APKTOOL = ComponentExternalTool("apktool", "https://ibotpeaches.github.io/Apktool/", "-version") JAVA = ComponentExternalTool( "java", "https://openjdk.org/projects/jdk/11/", - "--help", + "-help", apt_package="openjdk-11-jdk", brew_package="openjdk@11", )