Skip to content

Commit c53dee7

Browse files
author
Andy Herrick
committed
8266227: Fix help text for --mac-signing-keychain
Reviewed-by: almatvee, asemenyuk
1 parent 80323b7 commit c53dee7

File tree

3 files changed

+84
-62
lines changed

3 files changed

+84
-62
lines changed

src/jdk.jpackage/share/classes/jdk/jpackage/internal/resources/HelpResources.properties

+22-23
Original file line numberDiff line numberDiff line change
@@ -70,50 +70,50 @@ Generic Options:\n\
7070
\ --help -h \n\
7171
\ Print the usage text with a list and description of each valid\n\
7272
\ option for the current platform to the output stream, and exit\n\
73-
\ --icon <icon file path>\n\
73+
\ --icon <file path>\n\
7474
\ Path of the icon of the application package\n\
7575
\ (absolute path or relative to the current directory)\n\
7676
\ --name -n <name>\n\
7777
\ Name of the application and/or package\n\
7878
\ --dest -d <destination path>\n\
7979
\ Path where generated output file is placed\n\
80-
\ Defaults to the current working directory.\n\
8180
\ (absolute path or relative to the current directory)\n\
82-
\ --temp <file path>\n\
81+
\ Defaults to the current working directory.\n\
82+
\ --temp <directory path>\n\
8383
\ Path of a new or empty directory used to create temporary files\n\
8484
\ (absolute path or relative to the current directory)\n\
8585
\ If specified, the temp dir will not be removed upon the task\n\
86-
\ completion and must be removed manually\n\
86+
\ completion and must be removed manually.\n\
8787
\ If not specified, a temporary directory will be created and\n\
8888
\ removed upon the task completion.\n\
8989
\ --vendor <vendor string>\n\
9090
\ Vendor of the application\n\
9191
\ --verbose\n\
9292
\ Enables verbose output\n\
9393
\ --version\n\
94-
\ Print the product version to the output stream and exit\n\
94+
\ Print the product version to the output stream and exit.\n\
9595
\n\
9696
\Options for creating the runtime image:\n\
9797
\ --add-modules <module name>[,<module name>...]\n\
98-
\ A comma (",") separated list of modules to add.\n\
98+
\ A comma (",") separated list of modules to add\n\
9999
\ This module list, along with the main module (if specified)\n\
100100
\ will be passed to jlink as the --add-module argument.\n\
101-
\ if not specified, either just the main module (if --module is\n\
101+
\ If not specified, either just the main module (if --module is\n\
102102
\ specified), or the default set of modules (if --main-jar is \n\
103103
\ specified) are used.\n\
104104
\ This option can be used multiple times.\n\
105105
\ --module-path -p <module path>...\n\
106106
\ A {0} separated list of paths\n\
107107
\ Each path is either a directory of modules or the path to a\n\
108108
\ modular jar.\n\
109-
\ (each path is absolute or relative to the current directory)\n\
109+
\ (Each path is absolute or relative to the current directory.)\n\
110110
\ This option can be used multiple times.\n\
111111
\ --jlink-options <jlink options> \n\
112112
\ A space separated list of options to pass to jlink \n\
113113
\ If not specified, defaults to "--strip-native-commands \n\
114-
\ --strip-debug --no-man-pages --no-header-files" \n\
114+
\ --strip-debug --no-man-pages --no-header-files". \n\
115115
\ This option can be used multiple times.\n\
116-
\ --runtime-image <file path>\n\
116+
\ --runtime-image <directory path>\n\
117117
\ Path of the predefined runtime image that will be copied into\n\
118118
\ the application image\n\
119119
\ (absolute path or relative to the current directory)\n\
@@ -123,7 +123,7 @@ Generic Options:\n\
123123
\ --strip-native-commands.\n\
124124
\n\
125125
\Options for creating the application image:\n\
126-
\ --input -i <input path>\n\
126+
\ --input -i <directory path>\n\
127127
\ Path of the input directory that contains the files to be packaged\n\
128128
\ (absolute path or relative to the current directory)\n\
129129
\ All files in the input directory will be packaged into the\n\
@@ -168,7 +168,7 @@ Generic Options:\n\
168168
\Options for creating the application package:\n\
169169
\ --about-url <url>\n\
170170
\ URL of the application''s home page\n\
171-
\ --app-image <file path>\n\
171+
\ --app-image <directory path>\n\
172172
\ Location of the predefined application image that is used\n\
173173
\ to build an installable package\n\
174174
\ (absolute path or relative to the current directory)\n\
@@ -178,17 +178,17 @@ Generic Options:\n\
178178
\ The keys "extension", "mime-type", "icon", and "description"\n\
179179
\ can be used to describe the association.\n\
180180
\ This option can be used multiple times.\n\
181-
\ --install-dir <file path>\n\
181+
\ --install-dir <directory path>\n\
182182
\ {4}\
183183
\ --license-file <file path>\n\
184184
\ Path to the license file\n\
185185
\ (absolute path or relative to the current directory)\n\
186-
\ --resource-dir <path>\n\
186+
\ --resource-dir <directory path>\n\
187187
\ Path to override jpackage resources\n\
188188
\ Icons, template files, and other resources of jpackage can be\n\
189189
\ over-ridden by adding replacement resources to this directory.\n\
190190
\ (absolute path or relative to the current directory)\n\
191-
\ --runtime-image <file path>\n\
191+
\ --runtime-image <directory path>\n\
192192
\ Path of the predefined runtime image to install\n\
193193
\ (absolute path or relative to the current directory)\n\
194194
\ Option is required when creating a runtime package.\n\
@@ -206,7 +206,7 @@ MSG_Help_win_launcher=\
206206
MSG_Help_win_install=\
207207
\ --win-dir-chooser\n\
208208
\ Adds a dialog to enable the user to choose a directory in which\n\
209-
\ the product is installed\n\
209+
\ the product is installed.\n\
210210
\ --win-help-url <url>\n\
211211
\ URL where user can obtain further information or technical support\n\
212212
\ --win-menu\n\
@@ -219,7 +219,7 @@ MSG_Help_win_install=\
219219
\ Request to add desktop shortcut for this application\n\
220220
\ --win-shortcut-prompt\n\
221221
\ Adds a dialog to enable the user to choose if shortcuts\n\
222-
\ will be created by installer\n\
222+
\ will be created by installer.\n\
223223
\ --win-update-url <url>\n\
224224
\ URL of available application update information\n\
225225
\ --win-upgrade-uuid <id string>\n\
@@ -246,9 +246,8 @@ MSG_Help_mac_launcher=\
246246
\ an existing package identifier.\n\
247247
\ --mac-sign\n\
248248
\ Request that the package be signed\n\
249-
\ --mac-signing-keychain <file path>\n\
250-
\ Path of the keychain to search for the signing identity\n\
251-
\ (absolute path or relative to the current directory).\n\
249+
\ --mac-signing-keychain <keychain name>\n\
250+
\ Name of the keychain to search for the signing identity\n\
252251
\ If not specified, the standard keychains are used.\n\
253252
\ --mac-signing-key-user-name <team name>\n\
254253
\ Team or user name portion of Apple signing identities.\n\
@@ -275,12 +274,12 @@ MSG_Help_linux_install=\
275274
\ Type of the license ("License: <value>" of the RPM .spec)\n\
276275
\ --linux-app-release <release value>\n\
277276
\ Release value of the RPM <name>.spec file or \n\
278-
\ Debian revision value of the DEB control file.\n\
277+
\ Debian revision value of the DEB control file\n\
279278
\ --linux-app-category <category value>\n\
280279
\ Group value of the RPM <name>.spec file or \n\
281-
\ Section value of DEB control file.\n\
280+
\ Section value of DEB control file\n\
282281
\ --linux-shortcut\n\
283-
\ Creates a shortcut for the application\n\
282+
\ Creates a shortcut for the application.\n\
284283
285284
MSG_Help_mac_linux_install_dir=\
286285
\Absolute path of the installation directory of the application\n\

0 commit comments

Comments
 (0)