Skip to content

Commit bdc70c8

Browse files
committed
relative paths for windows' sake
1 parent b299b50 commit bdc70c8

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

packages/compass/scripts/verify-package-contents.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,19 @@ type Kind = 'osx_zip' | 'windows_zip' | 'linux_tar' | 'rhel_tar';
4141

4242
function extractArchive(artifactsDir: string, destinationPath: string): Kind {
4343
if (process.env.IS_OSX && process.env.OSX_ZIP_NAME) {
44-
const filepath = path.resolve(artifactsDir, process.env.OSX_ZIP_NAME);
44+
const filepath = path.join(artifactsDir, process.env.OSX_ZIP_NAME);
4545
execute('ditto', ['-xk', filepath, destinationPath]);
4646
return 'osx_zip';
4747
} else if (process.env.IS_WINDOWS && process.env.WINDOWS_ZIP_NAME) {
48-
const filepath = path.resolve(artifactsDir, process.env.WINDOWS_ZIP_NAME);
48+
const filepath = path.join(artifactsDir, process.env.WINDOWS_ZIP_NAME);
4949
execute('unzip', [filepath, '-d', destinationPath]);
5050
return 'windows_zip';
5151
} else if (process.env.IS_UBUNTU && process.env.LINUX_TAR_NAME) {
52-
const filepath = path.resolve(artifactsDir, process.env.LINUX_TAR_NAME);
52+
const filepath = path.join(artifactsDir, process.env.LINUX_TAR_NAME);
5353
execute('tar', ['xzf', filepath, '-C', destinationPath]);
5454
return 'linux_tar';
5555
} else if (process.env.IS_RHEL && process.env.RHEL_TAR_NAME) {
56-
const filepath = path.resolve(artifactsDir, process.env.RHEL_TAR_NAME);
56+
const filepath = path.join(artifactsDir, process.env.RHEL_TAR_NAME);
5757
execute('tar', ['xzf', filepath, '-C', destinationPath]);
5858
return 'linux_tar';
5959
} else {
@@ -62,9 +62,9 @@ function extractArchive(artifactsDir: string, destinationPath: string): Kind {
6262
}
6363

6464
function run() {
65-
const artifactsDir = path.resolve(__dirname, '..', 'dist');
66-
const destinationPath = path.resolve(fs.mkdtempSync('compass-package-'));
67-
const fixturePath = path.resolve(__dirname, 'fixtures');
65+
const artifactsDir = 'dist';
66+
const destinationPath = fs.mkdtempSync('compass-package-');
67+
const fixturePath = 'scripts/patterns';
6868

6969
try {
7070
const kind = extractArchive(artifactsDir, destinationPath);
@@ -76,7 +76,7 @@ function run() {
7676
'@electron/asar',
7777
'extract',
7878
basePath,
79-
path.resolve(
79+
path.join(
8080
path.dirname(basePath),
8181
path.basename(basePath) + '.fully-unpacked'
8282
),

0 commit comments

Comments
 (0)