Add package name to path

Author: fwal

lib/macos-install.js

@@ -30,8 +30,9 @@ function install(version, system) {
             let swiftPath = toolCache.find('swift-macOS', version);
             if (swiftPath === null || swiftPath.trim().length == 0) {
                 core.debug(`No matching installation found`);
-                const path = yield download(swift_versions_1.swiftPackage(version, system));
-                const extracted = yield unpack(path, version);
+                const pkg = swift_versions_1.swiftPackage(version, system);
+                const path = yield download(pkg);
+                const extracted = yield unpack(pkg, path, version);
                 swiftPath = extracted;
             }
             else {
@@ -71,43 +72,17 @@ function toolchainVersion(requestedVersion) {
         return match.groups.version;
     });
 }
-function setToolchainVersion(requestedVersion) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let output = '';
-        let error = '';
-        const options = {
-            listeners: {
-                stdout: (data) => {
-                    output += data.toString();
-                },
-                stderr: (data) => {
-                    error += data.toString();
-                }
-            }
-        };
-        yield exec_1.exec('xcrun', ['--toolchain', requestedVersion, '--run', 'swift', '--version'], options);
-        if (error) {
-            throw new Error(error);
-        }
-        const match = output.match(/(?<version>[0-9]+\.[0-9+]+(\.[0-9]+)?)/) || { groups: { version: null } };
-        if (!match.groups || !match.groups.version) {
-            return null;
-        }
-        return match.groups.version;
-    });
-}
 function download({ url }) {
     return __awaiter(this, void 0, void 0, function* () {
         core.debug('Downloading swift for macOS');
         return toolCache.downloadTool(url);
     });
 }
-function unpack(packagePath, version) {
+function unpack({ name }, packagePath, version) {
     return __awaiter(this, void 0, void 0, function* () {
         core.debug('Extracting package');
         const unpackedPath = yield extractXar(packagePath);
-        yield exec_1.exec('ls', ['-las', unpackedPath]);
-        const extractedPath = yield toolCache.extractTar(path.join(unpackedPath, 'Payload'));
+        const extractedPath = yield toolCache.extractTar(path.join(unpackedPath, name, 'Payload'));
         core.debug('Package extracted');
         const cachedPath = yield toolCache.cacheDir(extractedPath, 'swift-macOS', version);
         core.debug('Package cached');

src/macos-install.ts

@@ -17,8 +17,9 @@ export async function install(version: string, system: System) {
     if (swiftPath === null || swiftPath.trim().length == 0) {
       core.debug(`No matching installation found`)
 
-      const path = await download(swiftPackage(version, system))
-      const extracted = await unpack(path, version)
+      const pkg = swiftPackage(version, system)
+      const path = await download(pkg)
+      const extracted = await unpack(pkg, path, version)
 
       swiftPath = extracted
     } else {
@@ -66,46 +67,15 @@ async function toolchainVersion(requestedVersion: string) {
   return match.groups.version
 }
 
-async function setToolchainVersion(requestedVersion: string) {
-  let output = ''
-  let error = ''
-
-  const options = {
-    listeners: {
-      stdout: (data: Buffer) => {
-        output += data.toString()
-      },
-      stderr: (data: Buffer) => {
-        error += data.toString()
-      }
-    }
-  }
-
-  await exec('xcrun', ['--toolchain', requestedVersion, '--run', 'swift', '--version'], options)
-
-  if (error) {
-    throw new Error(error)
-  }
-
-  const match = output.match(/(?<version>[0-9]+\.[0-9+]+(\.[0-9]+)?)/) || { groups: { version: null } }
-
-  if (!match.groups || !match.groups.version) {
-    return null
-  }
-
-  return match.groups.version
-}
-
 async function download({ url }: Package) {
   core.debug('Downloading swift for macOS')
   return toolCache.downloadTool(url)
 }
 
-async function unpack(packagePath: string, version: string) {
+async function unpack({ name }: Package, packagePath: string, version: string) {
   core.debug('Extracting package')
   const unpackedPath = await extractXar(packagePath)
-  await exec('ls', ['-las', unpackedPath])
-  const extractedPath = await toolCache.extractTar(path.join(unpackedPath, 'Payload'))
+  const extractedPath = await toolCache.extractTar(path.join(unpackedPath, name, 'Payload'))
   core.debug('Package extracted')
   const cachedPath = await toolCache.cacheDir(extractedPath, 'swift-macOS', version)
   core.debug('Package cached')