Add multi-channel support to updateBrowser.js. Pull common code int…

…o `common.js`

Fixes brave/browser-laptop#11795

Auditors: @aekeus

bin/updateBrowser.js

@@ -10,8 +10,7 @@ var _ = require('underscore')
 var util = require('util')
 var semver = require('semver')
 
-var channelData = require('../src/common').channelData
-var platformData = require('../src/common').platformData
+const {channelData, platformData, getChannelName} = require('../src/common')
 var nope = require('../src/common').nope
 
 var args = require('yargs')
@@ -46,8 +45,8 @@ var preview = !args.release
 
 const BASE_URL = process.env.BASE_URL || 'https://brave-download.global.ssl.fastly.net/multi-channel/releases'
 
-const OSX_TEMPLATE = BASE_URL + '/CHANNEL/VERSION/osx/Brave-VERSION.zip'
-const LINUX64_TEMPLATE = BASE_URL + '/CHANNEL/VERSION/linux64/Brave.tar.bz2'
+const OSX_TEMPLATE = BASE_URL + '/CHANNEL/VERSION/osx/Brave{{channelName}}-VERSION.zip'
+const LINUX64_TEMPLATE = BASE_URL + '/CHANNEL/VERSION/linux64/Brave{{channelName}}.tar.bz2'
 
 var winx64_entry = {
   version: args.version,
@@ -60,13 +59,15 @@ var winia32_entry = _.clone(winx64_entry)
 
 var osx_entry = _.clone(winx64_entry)
 osx_entry.url = OSX_TEMPLATE
-osx_entry.url = osx_entry.url.replace(/VERSION/g, args.version)
-osx_entry.url = osx_entry.url.replace(/CHANNEL/g, args.channel)
+                  .replace(/VERSION/g, args.version)
+                  .replace(/CHANNEL/g, args.channel)
+                  .replace('{{channelName}}', getChannelName('osx', args.channel))
 
 var linux64_entry = _.clone(winx64_entry)
 linux64_entry.url = LINUX64_TEMPLATE
-linux64_entry.url = linux64_entry.url.replace(/VERSION/g, args.version)
-linux64_entry.url = linux64_entry.url.replace(/CHANNEL/g, args.channel)
+                      .replace(/VERSION/g, args.version)
+                      .replace(/CHANNEL/g, args.channel)
+                      .replace('{{channelName}}', getChannelName('linux', args.channel))
 
 var winia32_json = JSON.parse(fs.readFileSync(path.join(dataPath, args.channel, 'winia32.json')))
 var winx64_json = JSON.parse(fs.readFileSync(path.join(dataPath, args.channel, 'winx64.json')))
@@ -108,5 +109,5 @@ if (args.overwrite) {
 } else {
   console.log("Warning: nothing written to disk. Use --overwrite flag to write changes.")
 }
-  
+
 console.log("Done")

bin/uploadBrowser.js

@@ -25,7 +25,7 @@ var async = require('async')
 
 var AWS = require('aws-sdk')
 
-var channelData = require('../src/common').channelData
+const {channelData, getChannelName} = require('../src/common')
 
 var args = require('yargs')
     .usage('node bin/uploadBrowser.js --source=/full/directory/to/browser-laptop --send')
@@ -72,7 +72,7 @@ var OS_IDENTIFIER = 2
 // Recipe tuples containing local relative paths to files, key locations on S3, and an os identifier
 var recipes = [
   // Linux
-  ['dist/Brave.tar.bz2', 'multi-channel/releases/CHANNEL/VERSION/linux64', 'linux'],
+  ['dist/Brave{{channelName}}.tar.bz2', 'multi-channel/releases/CHANNEL/VERSION/linux64', 'linux'],
   ['dist/brave{{channelName}}_VERSION_amd64.deb', 'multi-channel/releases/CHANNEL/VERSION/debian64', 'linux'],
   ['dist/brave{{channelName}}-VERSION.x86_64.rpm', 'multi-channel/releases/CHANNEL/VERSION/fedora64', 'linux'],
 
@@ -113,26 +113,6 @@ if (args.channel === 'dev') {
   ])
 }
 
-const capitalizeFirstLetter = (word) => {
-  const firstLetter = word.charAt(0).toUpperCase()
-  return firstLetter + word.slice(1)
-}
-
-const getChannelName = () => {
-  if (args.channel === 'dev') {
-    return ''
-  }
-  switch (args.os) {
-    case 'windows':
-    case 'winx64':
-    case 'winia32':
-      return capitalizeFirstLetter(args.channel) + '-'
-    case 'osx':
-      return '-' + capitalizeFirstLetter(args.channel)
-  }
-  return '-' + args.channel
-}
-
 // filter the recipes based on the 'os' command line argument
 recipes = recipes.filter({
   all: (recipe) => { return true },
@@ -147,7 +127,7 @@ recipes = recipes.filter({
 recipes = recipes.map((recipe) => {
   var dist = recipe[LOCAL_LOCATION].replace('VERSION', version)
   dist = dist.replace('CHANNEL', args.channel)
-  dist = dist.replace('{{channelName}}', getChannelName())
+  dist = dist.replace('{{channelName}}', getChannelName(args.os, args.channel))
 
   var multi = recipe[REMOTE_LOCATION].replace('VERSION', version)
   multi = multi.replace('CHANNEL', args.channel)

src/common.js

@@ -34,10 +34,31 @@ var makeVlog = function (argsv) {
   return (v, ...vargs) => argsv >= v && console.log(...vargs)
 }
 
+const capitalizeFirstLetter = (word) => {
+  const firstLetter = word.charAt(0).toUpperCase()
+  return firstLetter + word.slice(1)
+}
+
+const getChannelName = (os, channel) => {
+  if (channel === 'dev') {
+    return ''
+  }
+  switch (os) {
+    case 'windows':
+    case 'winx64':
+    case 'winia32':
+      return capitalizeFirstLetter(channel) + '-'
+    case 'osx':
+      return '-' + capitalizeFirstLetter(channel)
+  }
+  return '-' + channel
+}
+
 module.exports = {
-  channelData: channelData,
-  platformData: platformData,
-  nope: nope,
-  makeVlog: makeVlog
+  channelData,
+  platformData,
+  nope,
+  makeVlog,
+  getChannelName
 }