Proper sub-package path

Author: fwal

lib/macos-install.js

@@ -78,11 +78,11 @@ function download({ url }) {
         return toolCache.downloadTool(url);
     });
 }
-function unpack({ fileName }, packagePath, version) {
+function unpack({ name }, packagePath, version) {
     return __awaiter(this, void 0, void 0, function* () {
         core.debug('Extracting package');
         const unpackedPath = yield extractXar(packagePath);
-        const extractedPath = yield toolCache.extractTar(path.join(unpackedPath, fileName, 'Payload'));
+        const extractedPath = yield toolCache.extractTar(path.join(unpackedPath, `${name}-package.pkg`, 'Payload'));
         core.debug('Package extracted');
         const cachedPath = yield toolCache.cacheDir(extractedPath, 'swift-macOS', version);
         core.debug('Package cached');

lib/swift-versions.js

@@ -60,8 +60,7 @@ function swiftPackage(version, system) {
     }
     return {
         url: `https://swift.org/builds/swift-${version}-release/${platform}/swift-${version}-RELEASE/${archiveFile}`,
-        name: archiveName,
-        fileName: archiveFile
+        name: archiveName
     };
 }
 exports.swiftPackage = swiftPackage;

src/macos-install.ts

@@ -72,10 +72,10 @@ async function download({ url }: Package) {
   return toolCache.downloadTool(url)
 }
 
-async function unpack({ fileName }: Package, packagePath: string, version: string) {
+async function unpack({ name }: Package, packagePath: string, version: string) {
   core.debug('Extracting package')
   const unpackedPath = await extractXar(packagePath)
-  const extractedPath = await toolCache.extractTar(path.join(unpackedPath, fileName, 'Payload'))
+  const extractedPath = await toolCache.extractTar(path.join(unpackedPath, `${name}-package.pkg`, 'Payload'))
   core.debug('Package extracted')
   const cachedPath = await toolCache.cacheDir(extractedPath, 'swift-macOS', version)
   core.debug('Package cached')

src/swift-versions.ts

@@ -37,7 +37,6 @@ function notEmpty<T>(value: T | null | undefined): value is T {
 export interface Package {
   url: string
   name: string
-  fileName: string
 }
 
 export function swiftPackage(version: string, system: System): Package {
@@ -62,8 +61,7 @@ export function swiftPackage(version: string, system: System): Package {
 
   return {
     url: `https://swift.org/builds/swift-${version}-release/${platform}/swift-${version}-RELEASE/${archiveFile}`,
-    name: archiveName,
-    fileName: archiveFile
+    name: archiveName
   }
 }