issue #98: jpackage option --package-type renamed to --type

beryx · Nov 13, 2019 · aa7e70b · aa7e70b
1 parent 82964f8
commit aa7e70b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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,