diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts index d034f395..eeccb05a 100644 --- a/src/vs/platform/update/electron-main/abstractUpdateService.ts +++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts @@ -61,7 +61,7 @@ export abstract class AbstractUpdateService implements IUpdateService { @IEnvironmentMainService private readonly environmentMainService: IEnvironmentMainService, @IRequestService protected requestService: IRequestService, @ILogService protected logService: ILogService, - @IProductService protected readonly productService: IProductService + @IProductService protected readonly productService: IProductService, ) { lifecycleMainService.when(LifecycleMainPhase.AfterWindowOpen) .finally(() => this.initialize()); diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts index c521b76f..5b00195a 100644 --- a/src/vs/platform/update/electron-main/updateService.darwin.ts +++ b/src/vs/platform/update/electron-main/updateService.darwin.ts @@ -34,7 +34,7 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau @IEnvironmentMainService environmentMainService: IEnvironmentMainService, @IRequestService requestService: IRequestService, @ILogService logService: ILogService, - @IProductService productService: IProductService + @IProductService productService: IProductService, ) { super(lifecycleMainService, configurationService, environmentMainService, requestService, logService, productService); diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts index c987ecce..0e2396a6 100644 --- a/src/vs/platform/update/electron-main/updateService.win32.ts +++ b/src/vs/platform/update/electron-main/updateService.win32.ts @@ -67,7 +67,7 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun @ILogService logService: ILogService, @IFileService private readonly fileService: IFileService, @INativeHostMainService private readonly nativeHostMainService: INativeHostMainService, - @IProductService productService: IProductService + @IProductService productService: IProductService, ) { super(lifecycleMainService, configurationService, environmentMainService, requestService, logService, productService); diff --git a/void-application/mac-sign.sh b/void-application/mac-sign.sh index c9c4632e..838dc9b8 100755 --- a/void-application/mac-sign.sh +++ b/void-application/mac-sign.sh @@ -129,6 +129,24 @@ updater(){ echo "Done!" } + +computehash() { + cd "${SIGNED_DOTAPP_DIR}" + + SHA1=$(shasum -a 1 "${SIGNED_DOTAPP}/Contents/MacOS/Electron" | cut -d' ' -f1) + SHA256=$(shasum -a 256 "${SIGNED_DOTAPP}/Contents/MacOS/Electron" | cut -d' ' -f1) + TIMESTAMP=$(date +%s) + + cat > hash.json << EOF +{ + "sha256hash": "${SHA256}", + "hash": "${SHA1}", + "timestamp": ${TIMESTAMP} +} +EOF +} + + USAGE="Usage: $0 {sign|notarize|updater} {arm64|x64}" # check to make sure arm64 or x64 is specified @@ -154,6 +172,9 @@ case "$1" in updater) updater ;; + computehash) + computehash + ;; *) echo $USAGE exit 1 diff --git a/void-application/mac.sh b/void-application/mac.sh index 1e94baec..0984654c 100755 --- a/void-application/mac.sh +++ b/void-application/mac.sh @@ -3,12 +3,14 @@ set -e -npm run vscode-darwin-arm64-min +npm run gulp vscode-darwin-arm64-min ./mac-sign.sh sign arm64 ./mac-sign.sh notarize arm64 ./mac-sign.sh updater arm64 +./mac-sign.sh computehash arm64 -npm run vscode-darwin-x64-min +npm run gulp vscode-darwin-x64-min ./mac-sign.sh sign x64 ./mac-sign.sh notarize x64 ./mac-sign.sh updater x64 +./mac-sign.sh computehash x64 diff --git a/void-application/windows.sh b/void-application/windows.sh index 66d55433..1f71203f 100755 --- a/void-application/windows.sh +++ b/void-application/windows.sh @@ -1,7 +1,7 @@ -npm run vscode-win32-x64-min +npm run gulp vscode-win32-x64-min npm run gulp vscode-win32-x64-inno-updater npm run gulp vscode-win32-x64-system-setup # change icon