0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-20 17:54:23 +01:00

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

This commit is contained in:
XhmikosR 2017-11-28 10:43:09 +02:00 committed by GitHub
parent 05d88ca285
commit 6050d72a3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions

View File

@ -14,8 +14,8 @@
const fs = require('fs') const fs = require('fs')
const path = require('path') const path = require('path')
const sh = require('shelljs') const sh = require('shelljs')
sh.config.fatal = true sh.config.fatal = true
const sed = sh.sed
// Blame TC39... https://github.com/benjamingr/RegExp.escape/issues/37 // Blame TC39... https://github.com/benjamingr/RegExp.escape/issues/37
RegExp.quote = (string) => string.replace(/[-\\^$*+?.()|[\]{}]/g, '\\$&') RegExp.quote = (string) => string.replace(/[-\\^$*+?.()|[\]{}]/g, '\\$&')
@ -58,7 +58,7 @@ function replaceRecursively(directory, excludedDirectories, allowedExtensions, o
replacement = RegExp.quoteReplacement(replacement) replacement = RegExp.quoteReplacement(replacement)
const updateFile = !DRY_RUN ? (filepath) => { const updateFile = !DRY_RUN ? (filepath) => {
if (allowedExtensions.has(path.parse(filepath).ext)) { if (allowedExtensions.has(path.parse(filepath).ext)) {
sed('-i', original, replacement, filepath) sh.sed('-i', original, replacement, filepath)
} }
} : (filepath) => { } : (filepath) => {
if (allowedExtensions.has(path.parse(filepath).ext)) { if (allowedExtensions.has(path.parse(filepath).ext)) {

View File

@ -16,11 +16,10 @@ const fs = require('fs')
const path = require('path') const path = require('path')
const sriToolbox = require('sri-toolbox') const sriToolbox = require('sri-toolbox')
const sh = require('shelljs') const sh = require('shelljs')
const sed = sh.sed
sh.config.fatal = true 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. // Array of objects which holds the files to generate SRI hashes for.
// `file` is the path from the root folder // `file` is the path from the root folder
@ -56,6 +55,6 @@ files.forEach((file) => {
console.log(`${file.configPropertyName}: ${integrity}`) 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)
}) })
}) })