mirror of
https://github.com/zen-browser/surfer.git
synced 2025-07-07 17:05:33 +02:00
Merge branch 'main' of https://github.com/zen-browser/surfer
This commit is contained in:
commit
a404ecac07
4 changed files with 14 additions and 11 deletions
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "@zen-browser/surfer",
|
"name": "@zen-browser/surfer",
|
||||||
"version": "1.4.14",
|
"version": "1.4.20",
|
||||||
"description": "Simplifying building firefox forks!",
|
"description": "Simplifying building firefox forks!",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"bin": {
|
"bin": {
|
||||||
|
|
|
@ -189,12 +189,10 @@ export const surferPackage = async () => {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!process.env.SURFER_SIGNING_MODE) {
|
const marPath = await createMarFile(version, channel, brandingDetails.release.github, zenMacDestDir)
|
||||||
const marPath = await createMarFile(version, channel, brandingDetails.release.github, zenMacDestDir)
|
dynamicConfig.set('marPath', marPath)
|
||||||
dynamicConfig.set('marPath', marPath)
|
|
||||||
|
|
||||||
await generateBrowserUpdateFiles()
|
await generateBrowserUpdateFiles()
|
||||||
}
|
|
||||||
|
|
||||||
log.info()
|
log.info()
|
||||||
log.info(`Output written to ${DIST_DIR}`)
|
log.info(`Output written to ${DIST_DIR}`)
|
||||||
|
@ -230,18 +228,19 @@ async function createMarFile(version: string, channel: string, github?: { repo:
|
||||||
? join(zenMacDestDir, `${getCurrentBrandName()}.app`)
|
? join(zenMacDestDir, `${getCurrentBrandName()}.app`)
|
||||||
: join(OBJ_DIR, 'dist', config.binaryName)
|
: join(OBJ_DIR, 'dist', config.binaryName)
|
||||||
|
|
||||||
const marPath = process.env.MAR ?? windowsPathToUnix(join(DIST_DIR, 'output.mar'));
|
const marPath = resolve(DIST_DIR, 'output.mar');
|
||||||
|
log.debug(`Writing MAR to ${DIST_DIR} from ${binary}`);
|
||||||
await configDispatch('./tools/update-packaging/make_full_update.sh', {
|
await configDispatch('./tools/update-packaging/make_full_update.sh', {
|
||||||
args: [
|
args: [
|
||||||
// The mar output location
|
// The mar output location
|
||||||
windowsPathToUnix(join(DIST_DIR)),
|
windowsPathToUnix(DIST_DIR),
|
||||||
windowsPathToUnix(binary),
|
windowsPathToUnix(binary),
|
||||||
],
|
],
|
||||||
cwd: ENGINE_DIR,
|
cwd: ENGINE_DIR,
|
||||||
env: {
|
env: {
|
||||||
MOZ_PRODUCT_VERSION: version,
|
MOZ_PRODUCT_VERSION: version,
|
||||||
MAR_CHANNEL_ID: channel,
|
MAR_CHANNEL_ID: channel,
|
||||||
MAR: marBinary,
|
MAR: process.env.MAR ? windowsPathToUnix(process.env.MAR) : marBinary,
|
||||||
},
|
},
|
||||||
shell: process.env.SURFER_SIGNING_MODE ? 'unix' : 'default',
|
shell: process.env.SURFER_SIGNING_MODE ? 'unix' : 'default',
|
||||||
})
|
})
|
||||||
|
|
|
@ -377,7 +377,7 @@ pref("app.update.promptWaitTime", 691200);
|
||||||
// wizard.
|
// wizard.
|
||||||
pref("app.update.url.manual", "https://zen-browser.app/download/");
|
pref("app.update.url.manual", "https://zen-browser.app/download/");
|
||||||
pref("app.update.url.details", "https://zen-browser.app/release-notes/latest/");
|
pref("app.update.url.details", "https://zen-browser.app/release-notes/latest/");
|
||||||
pref("app.releaseNotesURL", "https://zen-browser.app/release-notes/latest/%VERSION%/");
|
pref("app.releaseNotesURL", "https://zen-browser.app/release-notes/%VERSION%/");
|
||||||
pref("app.releaseNotesURL.aboutDialog", "https://www.zen-browser.app/release-notes/%VERSION%/");
|
pref("app.releaseNotesURL.aboutDialog", "https://www.zen-browser.app/release-notes/%VERSION%/");
|
||||||
pref("app.releaseNotesURL.prompt", "https://zen-browser.app/release-notes/%VERSION%/");
|
pref("app.releaseNotesURL.prompt", "https://zen-browser.app/release-notes/%VERSION%/");
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,11 @@ import { log } from '../log'
|
||||||
* @returns A unix path
|
* @returns A unix path
|
||||||
*/
|
*/
|
||||||
export const windowsPathToUnix = (path: string): string =>
|
export const windowsPathToUnix = (path: string): string =>
|
||||||
(process as any).platform == 'win32' ? path.replace(/\\/g, '/') : path
|
(process as any).platform == 'win32'
|
||||||
|
?
|
||||||
|
(process.env.SURFER_SIGNING_MODE ? "/c" : "")
|
||||||
|
+ path.replace(/[\\]+/g, '/').replace(/^([a-zA-Z]+:|\.\/)/, '')
|
||||||
|
: path
|
||||||
|
|
||||||
export async function walkDirectory(directory: string): Promise<string[]> {
|
export async function walkDirectory(directory: string): Promise<string[]> {
|
||||||
const output = []
|
const output = []
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue