jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-23 19:26:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix various code-signing Windows issues (#1135)

Browse Source 
- Add missing backslash that caused the command to not be interpreted
  completely

- Update `electron-sign-exe.exe` to `electron-sign-exe-win32.exe` in
  Makefile

- Use hyphen options instead of Windows slash style, which confuses bash

Signed-off-by: Juan Cruz Viotti <jviotti@openmailbox.org>
This commit is contained in:
Juan Cruz Viotti 2017-02-27 10:08:44 -04:00 committed by GitHub
parent be001cc266
commit d9bd509d22
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -242,8 +242,8 @@ ifeq ($(TARGET_PLATFORM),win32)
-o $@ -o $@
ifdef CODE_SIGN_CERTIFICATE ifdef CODE_SIGN_CERTIFICATE
ifdef CODE_SIGN_CERTIFICATE_PASSWORD ifdef CODE_SIGN_CERTIFICATE_PASSWORD
./scripts/build/electron-sign-exe.sh -f $@/$(APPLICATION_NAME).exe \ ./scripts/build/electron-sign-exe-win32.sh -f $@/$(APPLICATION_NAME).exe \
-d "$(APPLICATION_NAME) - $(APPLICATION_VERSION)" -d "$(APPLICATION_NAME) - $(APPLICATION_VERSION)" \
-c $(CODE_SIGN_CERTIFICATE) \ -c $(CODE_SIGN_CERTIFICATE) \
-p $(CODE_SIGN_CERTIFICATE_PASSWORD) -p $(CODE_SIGN_CERTIFICATE_PASSWORD)
endif endif
@ -316,8 +316,8 @@ $(BUILD_OUTPUT_DIRECTORY)/$(APPLICATION_NAME)-$(APPLICATION_VERSION)-win32-$(TAR
./scripts/build/electron-installer-nsis-win32.sh -n $(APPLICATION_NAME) -a $< -t $(BUILD_TEMPORARY_DIRECTORY) -o $@ ./scripts/build/electron-installer-nsis-win32.sh -n $(APPLICATION_NAME) -a $< -t $(BUILD_TEMPORARY_DIRECTORY) -o $@
ifdef CODE_SIGN_CERTIFICATE ifdef CODE_SIGN_CERTIFICATE
ifdef CODE_SIGN_CERTIFICATE_PASSWORD ifdef CODE_SIGN_CERTIFICATE_PASSWORD
./scripts/build/electron-sign-exe.sh -f $@ \ ./scripts/build/electron-sign-exe-win32.sh -f $@ \
-d "$(APPLICATION_NAME) - $(APPLICATION_VERSION)" -d "$(APPLICATION_NAME) - $(APPLICATION_VERSION)" \
-c $(CODE_SIGN_CERTIFICATE) \ -c $(CODE_SIGN_CERTIFICATE) \
-p $(CODE_SIGN_CERTIFICATE_PASSWORD) -p $(CODE_SIGN_CERTIFICATE_PASSWORD)
endif endif

10
scripts/build/electron-sign-exe-win32.sh
View File

@ -65,10 +65,10 @@ fi
TIMESTAMP_SERVER=http://timestamp.comodoca.com TIMESTAMP_SERVER=http://timestamp.comodoca.com
signtool sign \ signtool sign \
/t "$TIMESTAMP_SERVER" \ -t "$TIMESTAMP_SERVER" \
/d "$ARGV_SIGNATURE_DESCRIPTION" \ -d "$ARGV_SIGNATURE_DESCRIPTION" \
/f "$ARGV_CERTIFICATE_FILE" \ -f "$ARGV_CERTIFICATE_FILE" \
/p "$ARGV_CERTIFICATE_PASSWORD" \ -p "$ARGV_CERTIFICATE_PASSWORD" \
"$ARGV_FILE" "$ARGV_FILE"
signtool verify /pa /v "$ARGV_FILE" signtool verify -pa -v "$ARGV_FILE"