chore: Update package.json version to 1.1.1 and optimize Windows plat…

…form flags
zen-browser · Jul 23, 2024 · 9819e0e · 9819e0e
1 parent 0be65d2
commit 9819e0e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zen-browser/surfer",
-  "version": "1.0.39",
+  "version": "1.1.1",
   "description": "Simplifying building firefox forks!",
   "main": "index.js",
   "bin": {

diff --git a/src/commands/download/firefox.ts b/src/commands/download/firefox.ts
@@ -21,6 +21,7 @@ import {
   unpackAddon,
 } from './addon'
 import { configPath } from '../../utils';
+import fs from 'fs-extra'
 
 export function shouldSetupFirefoxSource() {
   return !(
@@ -67,9 +68,16 @@ async function unpackFirefoxSource(name: string): Promise<void> {
   log.info(`Unpacking ${resolve(MELON_TMP_DIR, name)} to ${ENGINE_DIR}`)
   if (process.platform === 'win32') {
     log.info('Unpacking Firefox source on Windows (7z)')
-    await execa('7z', ['x', resolve(MELON_TMP_DIR, name)]);
+    await execa('7z', ['x', resolve(MELON_TMP_DIR, name), '-o' + resolve(MELON_TMP_DIR, name.replace('.tar.xz', '.tar'))]);
     log.info('Unpacking Firefox source again without the .xz extension')
-    await execa('7z', ['x', resolve(MELON_TMP_DIR, name.replace('.tar.xz', '.tar')), '-o' + ENGINE_DIR]);
+    await execa('7z', ['x', resolve(MELON_TMP_DIR, name.replace('.tar.xz', '.tar')), '-o' + MELON_TMP_DIR]);
+    const archiveDir = resolve(MELON_TMP_DIR, 'firefox-' + config.version.version);
+    if (existsSync(ENGINE_DIR)) {
+      // remove the existing engine directory
+      fs.removeSync(ENGINE_DIR);
+    }
+    log.info('Moving Firefox source to engine directory');
+    fs.moveSync(archiveDir, ENGINE_DIR);
     return
   }
 

diff --git a/src/commands/init.ts b/src/commands/init.ts
@@ -43,38 +43,32 @@ export const init = async (directory: Command | string): Promise<void> => {
   await configDispatch('git', {
     args: ['init'],
     cwd: absoluteInitDirectory,
-    shell: 'unix',
   })
 
   await configDispatch('git', {
     args: ['init'],
     cwd: absoluteInitDirectory,
-    shell: 'unix',
   })
 
   await configDispatch('git', {
     args: ['checkout', '--orphan', version],
     cwd: absoluteInitDirectory,
-    shell: 'unix',
   })
 
   await configDispatch('git', {
     args: ['add', '-f', '.'],
     cwd: absoluteInitDirectory,
-    shell: 'unix',
   })
 
   log.info('Committing...')
 
   await configDispatch('git', {
     args: ['commit', '-aqm', `"Firefox ${version}"`],
     cwd: absoluteInitDirectory,
-    shell: 'unix',
   })
 
   await configDispatch('git', {
     args: ['checkout', '-b', config.name.toLowerCase().replace(/\s/g, '_')],
     cwd: absoluteInitDirectory,
-    shell: 'unix',
   })
 }