Merge pull request #60 from ggchivalrous/feat/v1.5

chore: 修改window下exiftool工具名称
ggchivalrous · Mar 25, 2024 · 4f9e930 · 4f9e930
2 parents c52a4eb + 0e34c79
commit 4f9e930
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/electron/src/path.ts b/electron/src/path.ts
@@ -1,4 +1,5 @@
 import { join } from 'node:path';
+import os from 'os';
 
 import { app } from 'electron';
 
@@ -11,7 +12,7 @@ const paths = {
   public: env.VITE_PUBLIC,
   logger: join(app.getPath('userData'), 'logs'),
   logo: '',
-  exiftool: join(isDev ? env.VITE_DIST_ELECTRON : app.getAppPath(), 'exiftool/exiftool'),
+  exiftool: join(isDev ? env.VITE_DIST_ELECTRON : app.getAppPath(), 'exiftool', os.platform() === 'win32' ? 'exiftool.exe' : 'exiftool'),
 };
 
 paths.public = isDev ? env.VITE_PUBLIC : paths.web;

diff --git a/scripts/install-exiftool.ts b/scripts/install-exiftool.ts
@@ -40,7 +40,7 @@ function installWinExiftool(outDir: string) {
   tryCatch(() => {
     const admzip = new AdmZip(WindowsExifToolPath);
     admzip.extractAllTo(outDir);
-    fs.renameSync(path.join(outDir, 'exiftool(-k).exe'), path.join(outDir, 'exiftool'));
+    fs.renameSync(path.join(outDir, 'exiftool(-k).exe'), path.join(outDir, 'exiftool.exe'));
     r(true);
   }, null, () => r(false));