Account for GOAMD64 suffix in directory names in NPM and GEM packages…

… [ci skip]
evilmartians · Jun 7, 2022 · fa2403e · fa2403e
1 parent 855ecce
commit fa2403e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/packaging/npm-bundled/get-exe.js b/packaging/npm-bundled/get-exe.js
@@ -13,9 +13,11 @@ function getExePath() {
   // Detect architecture
   // https://nodejs.org/api/process.html#process_process_arch
   let goArch = process.arch;
+  let suffix = '';
   switch (process.arch) {
     case 'x64': {
       goArch = 'amd64';
+      suffix = '_v1'; // GOAMD64
       break;
     }
     case 'x32':
@@ -28,7 +30,7 @@ function getExePath() {
   const dir = path.join(__dirname, 'bin');
   const executable = path.join(
     dir,
-    `lefthook_${goOS}_${goArch}`,
+    `lefthook_${goOS}_${goArch}${suffix}`,
     `lefthook${extension}`
   );
   return executable;

diff --git a/packaging/npm-bundled/package.json b/packaging/npm-bundled/package.json
@@ -29,7 +29,7 @@
     "ia32"
   ],
   "scripts": {
-    "version": "git clean -fd bin/ && (cd ../../dist/ && find . -executable -type f -exec cp --parents \\{\\} ../packaging/npm-bundled/bin/ \\;) && cp -f ../../README.md ./",
+    "version": "git clean -fdX bin/ && (cd ../../dist/ && find . -maxdepth 2 -executable -type f -exec cp --parents \\{\\} ../packaging/npm-bundled/bin/ \\;) && cp -f ../../README.md ./",
     "postinstall": "node postinstall.js"
   }
 }
diff --git a/packaging/rubygems/bin/lefthook b/packaging/rubygems/bin/lefthook
@@ -20,7 +20,9 @@ os =
   else raise "Unknown OS: #{platform.os}"
   end
 
-binary = "lefthook_#{os}_#{arch}/lefthook"
+suffix = arch == "amd64" ? "_v1" : "" # GOAMD64
+
+binary = "lefthook_#{os}_#{arch}#{suffix}/lefthook"
 binary = "#{binary}.exe" if os == "windows"
 
 args = $*.map { |x| x.include?(' ') ? "'" + x + "'" : x }