Go back to using unzip

2 files changed, 3 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e983d128ca28..b6f87722b623 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,6 +7,7 @@ pkgbase = ghidra-git
 	license = Apache
 	makedepends = git
 	makedepends = gradle
+	makedepends = unzip
 	depends = java-runtime-common
 	depends = jdk11-openjdk
 	provides = ghidra
diff --git a/PKGBUILD b/PKGBUILD
index 456bab425a8b..f0fbcc042632 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,6 +19,7 @@ depends=(
 makedepends=(
   'git'
   'gradle'
+  'unzip'
 )
 source=(
   "git+https://github.com/NationalSecurityAgency/ghidra"
@@ -79,7 +80,7 @@ package() {
   echo -e "${_prefix}Extracting the zip archive"
   _appver=$(grep -oP '(?<=^application.version=).*$' Ghidra/application.properties)
   _relname=$(grep -oP '(?<=^application.release.name=).*$' Ghidra/application.properties)
-  (cd "$pkgdir"/opt && jar xf "$srcdir/$_pkgname"/build/dist/ghidra_"${_appver}_${_relname}_$(date +"%Y%m%d")"_linux64.zip)
+  unzip -u build/dist/ghidra_"${_appver}_${_relname}_$(date +"%Y%m%d")"_linux64.zip -d "$pkgdir"/opt
 
   echo -e "${_prefix}Setting up a versionless directory name"
   mv "$pkgdir"/opt/ghidra{_"${_appver}_${_relname}",}