fix: remove name from paths

oclif · Apr 10, 2018 · 8b478dc · 8b478dc
1 parent 6a74b88
commit 8b478dc
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/src/config.ts b/src/config.ts
@@ -201,16 +201,16 @@ export class Config implements IConfig {
     s3.templates = {
       target: {
         baseDir: '<%- bin %>',
-        unversioned: "<%- name %><%- channel === 'stable' ? '' : '/channels/' + channel %>/<%- bin %>-<%- platform %>-<%- arch %><%- ext %>",
-        versioned: "<%- name %><%- channel === 'stable' ? '' : '/channels/' + channel %>/<%- bin %>-v<%- version %>/<%- bin %>-v<%- version %>-<%- platform %>-<%- arch %><%- ext %>",
-        manifest: "<%- name %><%- channel === 'stable' ? '' : '/channels/' + channel %>/<%- platform %>-<%- arch %>",
+        unversioned: "<%- channel === 'stable' ? '' : 'channels/' + channel + '/' %><%- bin %>-<%- platform %>-<%- arch %><%- ext %>",
+        versioned: "<%- channel === 'stable' ? '' : 'channels/' + channel + '/' %><%- bin %>-v<%- version %>/<%- bin %>-v<%- version %>-<%- platform %>-<%- arch %><%- ext %>",
+        manifest: "<%- channel === 'stable' ? '' : 'channels/' + channel + '/' %><%- platform %>-<%- arch %>",
         ...(s3.templates && s3.templates.target || {}),
       },
       vanilla: {
-        unversioned: "<%- name %><%- channel === 'stable' ? '' : '/channels/' + channel %>/<%- bin %><%- ext %>",
-        versioned: "<%- name %><%- channel === 'stable' ? '' : '/channels/' + channel %>/<%- bin %>-v<%- version %>/<%- bin %>-v<%- version %><%- ext %>",
+        unversioned: "<%- channel === 'stable' ? '' : 'channels/' + channel + '/' %><%- bin %><%- ext %>",
+        versioned: "<%- channel === 'stable' ? '' : 'channels/' + channel + '/' %><%- bin %>-v<%- version %>/<%- bin %>-v<%- version %><%- ext %>",
         baseDir: '<%- bin %>',
-        manifest: "<%- name %><%- channel === 'stable' ? '' : '/channels/' + channel %>/version",
+        manifest: "<%- channel === 'stable' ? '' : 'channels/' + channel + '/' %>version",
         ...(s3.templates && s3.templates.vanilla || {}),
       },
       ...s3.templates,

diff --git a/test/config.test.ts b/test/config.test.ts
@@ -83,22 +83,22 @@ describe('Config', () => {
     const beta = {version: '2.0.0-beta', channel: 'beta'}
     testConfig()
     .hasS3Key('baseDir', 'oclif-cli')
-    .hasS3Key('manifest', '@oclif/config/version')
-    .hasS3Key('manifest', '@oclif/config/channels/beta/version', beta)
-    .hasS3Key('manifest', '@oclif/config/darwin-x64', target)
-    .hasS3Key('manifest', '@oclif/config/channels/beta/darwin-x64', {...beta, ...target})
-    .hasS3Key('unversioned', '@oclif/config/oclif-cli.tar.gz')
-    .hasS3Key('unversioned', '@oclif/config/oclif-cli.tar.gz')
-    .hasS3Key('unversioned', '@oclif/config/channels/beta/oclif-cli.tar.gz', beta)
-    .hasS3Key('unversioned', '@oclif/config/channels/beta/oclif-cli.tar.gz', beta)
-    .hasS3Key('unversioned', '@oclif/config/oclif-cli-darwin-x64.tar.gz', target)
-    .hasS3Key('unversioned', '@oclif/config/oclif-cli-darwin-x64.tar.gz', target)
-    .hasS3Key('unversioned', '@oclif/config/channels/beta/oclif-cli-darwin-x64.tar.gz', {...beta, ...target})
-    .hasS3Key('unversioned', '@oclif/config/channels/beta/oclif-cli-darwin-x64.tar.gz', {...beta, ...target})
-    .hasS3Key('versioned', '@oclif/config/oclif-cli-v1.0.0/oclif-cli-v1.0.0.tar.gz')
-    .hasS3Key('versioned', '@oclif/config/oclif-cli-v1.0.0/oclif-cli-v1.0.0-darwin-x64.tar.gz', target)
-    .hasS3Key('versioned', '@oclif/config/channels/beta/oclif-cli-v2.0.0-beta/oclif-cli-v2.0.0-beta.tar.gz', beta)
-    .hasS3Key('versioned', '@oclif/config/channels/beta/oclif-cli-v2.0.0-beta/oclif-cli-v2.0.0-beta-darwin-x64.tar.gz', {...beta, ...target})
+    .hasS3Key('manifest', 'version')
+    .hasS3Key('manifest', 'channels/beta/version', beta)
+    .hasS3Key('manifest', 'darwin-x64', target)
+    .hasS3Key('manifest', 'channels/beta/darwin-x64', {...beta, ...target})
+    .hasS3Key('unversioned', 'oclif-cli.tar.gz')
+    .hasS3Key('unversioned', 'oclif-cli.tar.gz')
+    .hasS3Key('unversioned', 'channels/beta/oclif-cli.tar.gz', beta)
+    .hasS3Key('unversioned', 'channels/beta/oclif-cli.tar.gz', beta)
+    .hasS3Key('unversioned', 'oclif-cli-darwin-x64.tar.gz', target)
+    .hasS3Key('unversioned', 'oclif-cli-darwin-x64.tar.gz', target)
+    .hasS3Key('unversioned', 'channels/beta/oclif-cli-darwin-x64.tar.gz', {...beta, ...target})
+    .hasS3Key('unversioned', 'channels/beta/oclif-cli-darwin-x64.tar.gz', {...beta, ...target})
+    .hasS3Key('versioned', 'oclif-cli-v1.0.0/oclif-cli-v1.0.0.tar.gz')
+    .hasS3Key('versioned', 'oclif-cli-v1.0.0/oclif-cli-v1.0.0-darwin-x64.tar.gz', target)
+    .hasS3Key('versioned', 'channels/beta/oclif-cli-v2.0.0-beta/oclif-cli-v2.0.0-beta.tar.gz', beta)
+    .hasS3Key('versioned', 'channels/beta/oclif-cli-v2.0.0-beta/oclif-cli-v2.0.0-beta-darwin-x64.tar.gz', {...beta, ...target})
   })
 
   testConfig()