Permalink
Browse files

Combine path and remove variable used in one place. (#24873)

  • Loading branch information...
XhmikosR committed Nov 28, 2017
1 parent 05d88ca commit 6050d72a3a0423fd3383ab978f8c3843f91c1002
Showing with 4 additions and 5 deletions.
  1. +2 −2 build/change-version.js
  2. +2 −3 build/generate-sri.js
View
@@ -14,8 +14,8 @@
const fs = require('fs')
const path = require('path')
const sh = require('shelljs')
sh.config.fatal = true
const sed = sh.sed
// Blame TC39... https://github.com/benjamingr/RegExp.escape/issues/37
RegExp.quote = (string) => string.replace(/[-\\^$*+?.()|[\]{}]/g, '\\$&')
@@ -58,7 +58,7 @@ function replaceRecursively(directory, excludedDirectories, allowedExtensions, o
replacement = RegExp.quoteReplacement(replacement)
const updateFile = !DRY_RUN ? (filepath) => {
if (allowedExtensions.has(path.parse(filepath).ext)) {
sed('-i', original, replacement, filepath)
sh.sed('-i', original, replacement, filepath)
}
} : (filepath) => {
if (allowedExtensions.has(path.parse(filepath).ext)) {
View
@@ -16,11 +16,10 @@ const fs = require('fs')
const path = require('path')
const sriToolbox = require('sri-toolbox')
const sh = require('shelljs')
const sed = sh.sed
sh.config.fatal = true
const configFile = path.join(__dirname, '..', '_config.yml')
const configFile = path.join(__dirname, '../_config.yml')
// Array of objects which holds the files to generate SRI hashes for.
// `file` is the path from the root folder
@@ -56,6 +55,6 @@ files.forEach((file) => {
console.log(`${file.configPropertyName}: ${integrity}`)
sed('-i', new RegExp(`(\\s${file.configPropertyName}:\\s+"|')(\\S+)("|')`), '$1' + integrity + '$3', configFile)
sh.sed('-i', new RegExp(`(\\s${file.configPropertyName}:\\s+"|')(\\S+)("|')`), '$1' + integrity + '$3', configFile)
})
})

0 comments on commit 6050d72

Please sign in to comment.