Skip to content

Commit 8303002

Browse files
authored
Merge a577374 into 48b97ac
2 parents 48b97ac + a577374 commit 8303002

File tree

3 files changed

+0
-17
lines changed

3 files changed

+0
-17
lines changed

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgPackager.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -368,16 +368,8 @@ private void prepareMainScripts() throws IOException {
368368

369369
Files.createDirectories(scriptsRoot);
370370

371-
final Map<String, String> data = new HashMap<>();
372-
373-
final var appLocation = pkg.asInstalledPackageApplicationLayout().orElseThrow().appDirectory();
374-
375-
data.put("INSTALL_LOCATION", Path.of("/").resolve(pkg.relativeInstallDir()).toString());
376-
data.put("APP_LOCATION", appLocation.toString());
377-
378371
MacPkgInstallerScripts.createAppScripts()
379372
.setResourceDir(env.resourceDir().orElse(null))
380-
.setSubstitutionData(data)
381373
.saveInFolder(scriptsRoot);
382374
}
383375

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
#!/usr/bin/env sh
22

3-
chown root:wheel "INSTALL_LOCATION"
4-
chmod a+rX "INSTALL_LOCATION"
5-
chmod +r "APP_LOCATION/"*.jar
6-
73
exit 0
Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11
#!/usr/bin/env sh
22

3-
if [ ! -d "INSTALL_LOCATION" ]
4-
then
5-
mkdir -p "INSTALL_LOCATION"
6-
fi
7-
83
exit 0

0 commit comments

Comments
 (0)