diff --git a/packaging/npm-bundled/package.json b/packaging/npm-bundled/package.json index 28dde3bd..fe60ec8b 100644 --- a/packaging/npm-bundled/package.json +++ b/packaging/npm-bundled/package.json @@ -2,7 +2,7 @@ "name": "@evilmartians/lefthook", "version": "1.6.18", "description": "Simple git hooks manager", - "main": "index.js", + "main": "bin/index.js", "bin": { "lefthook": "./bin/index.js" }, diff --git a/packaging/npm-installer/package.json b/packaging/npm-installer/package.json index 4282e6a9..2b423fa6 100644 --- a/packaging/npm-installer/package.json +++ b/packaging/npm-installer/package.json @@ -2,7 +2,7 @@ "name": "@evilmartians/lefthook-installer", "version": "1.6.18", "description": "Simple git hooks manager", - "main": "index.js", + "main": "bin/index.js", "bin": { "lefthook": "./bin/index.js" }, diff --git a/packaging/npm/lefthook-darwin-arm64/package.json b/packaging/npm/lefthook-darwin-arm64/package.json index a542c879..61d305e3 100644 --- a/packaging/npm/lefthook-darwin-arm64/package.json +++ b/packaging/npm/lefthook-darwin-arm64/package.json @@ -2,6 +2,9 @@ "name": "lefthook-darwin-arm64", "version": "1.6.18", "description": "The macOS ARM 64-bit binary for lefthook, git hooks manager.", + "bin": { + "lefthook": "bin/lefthook" + }, "preferUnplugged": false, "repository": "https://github.com/evilmartians/lefthook", "license": "MIT", diff --git a/packaging/npm/lefthook-darwin-x64/package.json b/packaging/npm/lefthook-darwin-x64/package.json index 4326f58c..75e02d94 100644 --- a/packaging/npm/lefthook-darwin-x64/package.json +++ b/packaging/npm/lefthook-darwin-x64/package.json @@ -2,6 +2,9 @@ "name": "lefthook-darwin-x64", "version": "1.6.18", "description": "The macOS 64-bit binary for lefthook, git hooks manager.", + "bin": { + "lefthook": "bin/lefthook" + }, "preferUnplugged": false, "repository": "https://github.com/evilmartians/lefthook", "license": "MIT", diff --git a/packaging/npm/lefthook-freebsd-arm64/package.json b/packaging/npm/lefthook-freebsd-arm64/package.json index 2fb90948..7cbef9e6 100644 --- a/packaging/npm/lefthook-freebsd-arm64/package.json +++ b/packaging/npm/lefthook-freebsd-arm64/package.json @@ -2,6 +2,9 @@ "name": "lefthook-freebsd-arm64", "version": "1.6.18", "description": "The FreeBSD ARM 64-bit binary for lefthook, git hooks manager.", + "bin": { + "lefthook": "bin/lefthook" + }, "preferUnplugged": false, "repository": "https://github.com/evilmartians/lefthook", "license": "MIT", diff --git a/packaging/npm/lefthook-freebsd-x64/package.json b/packaging/npm/lefthook-freebsd-x64/package.json index 1de76b75..d6b3ea19 100644 --- a/packaging/npm/lefthook-freebsd-x64/package.json +++ b/packaging/npm/lefthook-freebsd-x64/package.json @@ -2,6 +2,9 @@ "name": "lefthook-freebsd-x64", "version": "1.6.18", "description": "The FreeBSD 64-bit binary for lefthook, git hooks manager.", + "bin": { + "lefthook": "bin/lefthook" + }, "preferUnplugged": false, "repository": "https://github.com/evilmartians/lefthook", "license": "MIT", diff --git a/packaging/npm/lefthook-linux-arm64/package.json b/packaging/npm/lefthook-linux-arm64/package.json index ce54f941..7ad48b4d 100644 --- a/packaging/npm/lefthook-linux-arm64/package.json +++ b/packaging/npm/lefthook-linux-arm64/package.json @@ -2,6 +2,9 @@ "name": "lefthook-linux-arm64", "version": "1.6.18", "description": "The Linux ARM 64-bit binary for lefthook, git hooks manager.", + "bin": { + "lefthook": "bin/lefthook" + }, "preferUnplugged": false, "repository": "https://github.com/evilmartians/lefthook", "license": "MIT", diff --git a/packaging/npm/lefthook-linux-x64/package.json b/packaging/npm/lefthook-linux-x64/package.json index dbf3e771..e360b4bf 100644 --- a/packaging/npm/lefthook-linux-x64/package.json +++ b/packaging/npm/lefthook-linux-x64/package.json @@ -2,6 +2,9 @@ "name": "lefthook-linux-x64", "version": "1.6.18", "description": "The Linux 64-bit binary for lefthook, git hooks manager.", + "bin": { + "lefthook": "bin/lefthook" + }, "preferUnplugged": false, "repository": "https://github.com/evilmartians/lefthook", "license": "MIT", diff --git a/packaging/npm/lefthook-windows-arm64/package.json b/packaging/npm/lefthook-windows-arm64/package.json index b189ab91..d9cf1f17 100644 --- a/packaging/npm/lefthook-windows-arm64/package.json +++ b/packaging/npm/lefthook-windows-arm64/package.json @@ -2,6 +2,9 @@ "name": "lefthook-windows-arm64", "version": "1.6.18", "description": "The Windows ARM 64-bit binary for lefthook, git hooks manager.", + "bin": { + "lefthook": "bin/lefthook" + }, "preferUnplugged": false, "repository": "https://github.com/evilmartians/lefthook", "license": "MIT", diff --git a/packaging/npm/lefthook-windows-x64/package.json b/packaging/npm/lefthook-windows-x64/package.json index 0ed12944..ec4c2e2d 100644 --- a/packaging/npm/lefthook-windows-x64/package.json +++ b/packaging/npm/lefthook-windows-x64/package.json @@ -2,6 +2,9 @@ "name": "lefthook-windows-x64", "version": "1.6.18", "description": "The Windows 64-bit binary for lefthook, git hooks manager.", + "bin": { + "lefthook": "bin/lefthook" + }, "preferUnplugged": false, "repository": "https://github.com/evilmartians/lefthook", "license": "MIT", diff --git a/packaging/npm/lefthook/bin/index.js b/packaging/npm/lefthook/bin/index.js deleted file mode 100755 index 2e64e83e..00000000 --- a/packaging/npm/lefthook/bin/index.js +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env node - -var spawn = require('child_process').spawn; -const { getExePath } = require('../get-exe'); - -var command_args = process.argv.slice(2); - -var child = spawn( - getExePath(), - command_args, - { stdio: "inherit" }); - -child.on('close', function (code) { - if (code !== 0) { - process.exit(1); - } -}); diff --git a/packaging/npm/lefthook/get-exe.js b/packaging/npm/lefthook/get-exe.js index c67258ec..ddf8f234 100644 --- a/packaging/npm/lefthook/get-exe.js +++ b/packaging/npm/lefthook/get-exe.js @@ -1,20 +1,20 @@ -const path = require("path") +const path = require("path"); function getExePath() { // Detect OS // https://nodejs.org/api/process.html#process_process_platform let os = process.platform; - let extension = ''; - if (['win32', 'cygwin'].includes(process.platform)) { - os = 'windows'; - extension = '.exe'; + let extension = ""; + if (["win32", "cygwin"].includes(process.platform)) { + os = "windows"; + extension = ".exe"; } // Detect architecture // https://nodejs.org/api/process.html#process_process_arch let arch = process.arch; - return require.resolve(`lefthook-${os}-${arch}/bin/lefthook${extension}`) + return require.resolve(`lefthook-${os}-${arch}/bin/lefthook${extension}`); } exports.getExePath = getExePath; diff --git a/packaging/npm/lefthook/package.json b/packaging/npm/lefthook/package.json index 3ddc8013..fad43a28 100644 --- a/packaging/npm/lefthook/package.json +++ b/packaging/npm/lefthook/package.json @@ -2,11 +2,7 @@ "name": "lefthook", "version": "1.6.18", "description": "Simple git hooks manager", - "main": "index.js", "repository": "https://github.com/evilmartians/lefthook", - "bin": { - "lefthook": "bin/index.js" - }, "keywords": [ "git", "hook", diff --git a/packaging/npm/lefthook/postinstall.js b/packaging/npm/lefthook/postinstall.js index 200e7561..23e01eb8 100644 --- a/packaging/npm/lefthook/postinstall.js +++ b/packaging/npm/lefthook/postinstall.js @@ -1,19 +1,21 @@ -const { spawnSync } = require("child_process") -const { getExePath } = require("./get-exe") +const { spawnSync } = require("child_process"); +const { getExePath } = require("./get-exe"); function install() { if (process.env.CI) { - return + return; } spawnSync(getExePath(), ["install", "-f"], { cwd: process.env.INIT_CWD || process.cwd(), stdio: "inherit", - }) + }); } try { - install() -} catch(e) { - console.warn("'lefthook install' command failed. Try running it manually.\n" + e) + install(); +} catch (e) { + console.warn( + "'lefthook install' command failed. Try running it manually.\n" + e, + ); }