From 26f66c4db1139790f7e743aa2b6265ba953ae429 Mon Sep 17 00:00:00 2001 From: kokocan12 Date: Wed, 29 Jun 2022 16:08:07 +0900 Subject: [PATCH] fix window file path error --- __test__/meta-data-setting/package.json | 2 +- package.json | 2 +- src/git-commit-msg-validator.js | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/__test__/meta-data-setting/package.json b/__test__/meta-data-setting/package.json index 4a796f4..9593bbe 100644 --- a/__test__/meta-data-setting/package.json +++ b/__test__/meta-data-setting/package.json @@ -6,5 +6,5 @@ "scripts": { "postinstall": "git-commit-msg-validator" }, "dependencies": { "git-commit-msg-validator": "^1.0.4" }, "git-commit-msg-validator": "/^\\[[\\S]+\\] [\\S\\s]+\\s:\\s[\\S\\s]+/", - "devDependencies": { "git-commit-msg-validator": "^1.0.7" } + "devDependencies": { "git-commit-msg-validator": "^1.1.1" } } diff --git a/package.json b/package.json index 07c0d2b..8a06070 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "git-commit-msg-validator", - "version": "1.1.1", + "version": "1.1.2", "description": "This is a simple git commit message validator.", "author": "kokocan12 ", "license": "MIT", diff --git a/src/git-commit-msg-validator.js b/src/git-commit-msg-validator.js index b663d79..64395ce 100644 --- a/src/git-commit-msg-validator.js +++ b/src/git-commit-msg-validator.js @@ -6,7 +6,7 @@ const prettier = require('prettier'); const START_TEXT = "# GIT_COMMIT_MSG_VALIDATOR_START"; const END_TEXT = "# GIT_COMMIT_MSG_VALIDATOR_END"; const RUN_HOOK = "./node_modules/.bin/git-commit-msg-validator-run-hook"; -const VERSION = "1.1.1" +const VERSION = "1.1.2" function getPackageJson(projectPath = process.cwd()) { if (typeof projectPath !== "string") { @@ -112,7 +112,7 @@ function getGitProjectRoot(directory=process.cwd()) { function getCommitMsg() { const gitRoot = getGitProjectRoot(); - const commitMsgFile = gitRoot + '/' + 'COMMIT_EDITMSG'; + const commitMsgFile = path.join(gitRoot, 'COMMIT_EDITMSG'); if(fs.existsSync(commitMsgFile)) { const commitMsg = fs.readFileSync(commitMsgFile, {encoding:'utf-8'}); @@ -125,13 +125,13 @@ function getCommitMsg() { function setHooks() { const gitRoot = getGitProjectRoot(); - const hooksDir = gitRoot + '/hooks'; - const commitMsgFilePath = hooksDir + '/commit-msg'; + const hooksDir = path.join(gitRoot, 'hooks'); + const commitMsgFilePath = path.join(hooksDir, '/commit-msg'); const HOOK_TEXT = "\n" + START_TEXT + "\n" + RUN_HOOK + "\n" + END_TEXT + "\n"; if(fs.existsSync(commitMsgFilePath)) { - const commitMsgContent = fs.readFileSync(hooksDir + '/commit-msg', {encoding: "utf-8"}); + const commitMsgContent = fs.readFileSync(commitMsgFilePath, {encoding: "utf-8"}); const startIdx = commitMsgContent.indexOf(START_TEXT); const endIdx = commitMsgContent.indexOf(END_TEXT);