diff --git a/build/resignAndPackage.sh b/build/resignAndPackage.sh index 92ea57c..61298fe 100644 --- a/build/resignAndPackage.sh +++ b/build/resignAndPackage.sh @@ -1,7 +1,7 @@ # Build the MAS app CSC_IDENTITY_AUTO_DISCOVERY=false npx electron-builder -c electron-builder-mas.yml --mac mas:universal # Add ElectronTeamID to Info.plist -sed -i '' -e 's/<\/dict>/ElectronTeamID<\/key>EM8VE646TZ<\/string><\/dict>/g' "/Users/haoyuanliu/Developer/fluent-reader/bin/darwin/universal/mas-universal/Fluent Reader.app/Contents/Info.plist" +sed -i '' -e 's/<\/dict>/ElectronTeamID<\/key>EM8VE646TZ<\/string><\/dict>/g' "bin/darwin/universal/mas-universal/Fluent Reader.app/Contents/Info.plist" printf "......................\nresignAndPackage start\n\n" @@ -10,9 +10,9 @@ APP="Fluent Reader" # Your Certificate name. CERT="Jieyu Yan (EM8VE646TZ)" # The path of your app to sign. -APP_PATH="/Users/haoyuanliu/Developer/fluent-reader/bin/darwin/universal/mas-universal/Fluent Reader.app" +APP_PATH="bin/darwin/universal/mas-universal/Fluent Reader.app" # The path to the location you want to put the signed package. -RESULT_PATH="/Users/haoyuanliu/Developer/fluent-reader/bin/$APP-mac_store.pkg" +RESULT_PATH="bin/$APP-mac_store.pkg" # The name of certificates you requested. APP_KEY="Apple Distribution: $CERT" INSTALLER_KEY="3rd Party Mac Developer Installer: $CERT" diff --git a/electron-builder.yml b/electron-builder.yml index d61e655..bf4d3e7 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -19,6 +19,7 @@ mac: - es - de - tr + - ja - sv - uk - it @@ -26,7 +27,6 @@ mac: win: target: - nsis - - appx - zip appx: applicationId: FluentReader @@ -41,6 +41,7 @@ appx: - es - de - tr + - ja - sv - uk - it diff --git a/package.json b/package.json index 0623397..d029103 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "build": "webpack --config ./webpack.config.js", "electron": "electron ./dist/electron.js", "start": "npm run build && npm run electron", - "package-win": "electron-builder -w --x64 && electron-builder -w --ia32 && electron-builder -w appx:arm64", + "package-win": "electron-builder -w appx:x64 && electron-builder -w appx:ia32 && electron-builder -w appx:arm64", "package-win-ci": "electron-builder -w --x64 -p never && electron-builder -w --ia32 -p never", "package-mac": "electron-builder --mac --x64", "package-mas": "bash build/resignAndPackage.sh",