From aa7e70b137584b93a5bf53dae04023443227915f Mon Sep 17 00:00:00 2001
From: Serban Iordache <iordache@hotmail.com>
Date: Wed, 13 Nov 2019 08:34:38 +0100
Subject: [PATCH] issue #98: jpackage option --package-type renamed to --type

---
 doc/user_guide.adoc                                             | 2 +-
 .../groovy/org/beryx/jlink/impl/JPackageImageTaskImpl.groovy    | 2 +-
 src/main/groovy/org/beryx/jlink/impl/JPackageTaskImpl.groovy    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/user_guide.adoc b/doc/user_guide.adoc
index de431d15..31ef4f69 100644
--- a/doc/user_guide.adoc
+++ b/doc/user_guide.adoc
@@ -659,7 +659,7 @@ can be configured in the `jpackage` script block.
 ----
 - if <i>skipInstaller</i> is <i>false</i>:
         create a platform-specific application installer in <font color="cadetblue">installerOutputDir</font> by executing:
-        <i>jpackage --package-type <font color="midnightblue">installerType</font> --app-image=<font color="saddlebrown">imageOutputDir</font>/<font color="midnightblue">imageName</font> ...</i>
+        <i>jpackage --type <font color="midnightblue">installerType</font> --app-image=<font color="saddlebrown">imageOutputDir</font>/<font color="midnightblue">imageName</font> ...</i>
 ----
 The properties pass:[<font color="cadetblue">installerOutputDir</font>, <font color="midnightblue">installerType</font>, <font color="saddlebrown">imageOutputDir</font>, and <font color="midnightblue">imageName</font>]
 can be configured in the `jpackage` script block.
diff --git a/src/main/groovy/org/beryx/jlink/impl/JPackageImageTaskImpl.groovy b/src/main/groovy/org/beryx/jlink/impl/JPackageImageTaskImpl.groovy
index 6725daa3..c12c3b6f 100644
--- a/src/main/groovy/org/beryx/jlink/impl/JPackageImageTaskImpl.groovy
+++ b/src/main/groovy/org/beryx/jlink/impl/JPackageImageTaskImpl.groovy
@@ -83,7 +83,7 @@ class JPackageImageTaskImpl extends BaseTaskImpl<JPackageTaskData> {
             final def resourceOpts = (resourceDir == null) ? [] : [ '--resource-dir', resourceDir ]
 
             commandLine = [jpackageExec,
-                           '--package-type', 'app-image',
+                           '--type', 'app-image',
                            '--dest', outputDir,
                            '--name', jpd.imageName,
                            '--module-path', td.jlinkJarsDir,
diff --git a/src/main/groovy/org/beryx/jlink/impl/JPackageTaskImpl.groovy b/src/main/groovy/org/beryx/jlink/impl/JPackageTaskImpl.groovy
index 028a304a..43cfbc39 100644
--- a/src/main/groovy/org/beryx/jlink/impl/JPackageTaskImpl.groovy
+++ b/src/main/groovy/org/beryx/jlink/impl/JPackageTaskImpl.groovy
@@ -79,7 +79,7 @@ class JPackageTaskImpl extends BaseTaskImpl<JPackageTaskData> {
                 final def resourceOpts = (resourceDir == null) ? [] : [ '--resource-dir', resourceDir ]
 
                 commandLine = [jpackageExec,
-                               '--package-type', packageType,
+                               '--type', packageType,
                                '--dest', td.jpackageData.getInstallerOutputDir(),
                                '--name', jpd.installerName,
                                *versionOpts,