diff --git a/.idea/bashsupport_project.xml b/.idea/bashsupport_project.xml
index 5aa825effb2..85d5b63ed56 100644
--- a/.idea/bashsupport_project.xml
+++ b/.idea/bashsupport_project.xml
@@ -8,6 +8,7 @@
The path to entitlements file for signing the app. build/entitlements.mac.plist will be used if exists (it is a recommended way to set). MAS entitlements is specified in the [.build.mas](#MasBuildOptions-entitlements).
| entitlementsInherit | The path to child entitlements which inherit the security settings for signing frameworks and bundles of a distribution. build/entitlements.mac.inherit.plist will be used if exists (it is a recommended way to set). Otherwise [default](https://github.com/electron-userland/electron-osx-sign/blob/master/default.entitlements.darwin.inherit.plist).
This option only applies when signing with entitlements provided.
+| bundleVersion | {
}
else {
return Object.assign({
- description: this.appInfo.description,
+ description: this.info.appInfo.description,
}, options)
}
}
diff --git a/src/macPackager.ts b/src/macPackager.ts
index 6f1a3fe9767..070de44c895 100644
--- a/src/macPackager.ts
+++ b/src/macPackager.ts
@@ -8,6 +8,7 @@ import { deepAssign } from "./util/deepAssign"
import { signAsync, flatAsync, BaseSignOptions, SignOptions, FlatOptions } from "electron-osx-sign"
import { DmgTarget } from "./targets/dmg"
import { createCommonTarget, DEFAULT_TARGET } from "./targets/targetFactory"
+import { AppInfo } from "./appInfo"
//noinspection JSUnusedLocalSymbols
const __awaiter = require("./util/awaiter")
@@ -28,6 +29,10 @@ export default class MacPackager extends PlatformPackager {
}
}
+ protected prepareAppInfo(appInfo: AppInfo): AppInfo {
+ return new AppInfo(appInfo.metadata, this.devMetadata, this.platformSpecificBuildOptions.bundleVersion)
+ }
+
async getIconPath(): Promise {
let iconPath = this.platformSpecificBuildOptions.icon || this.devMetadata.build.icon
if (iconPath != null && !iconPath.endsWith(".icns")) {
diff --git a/src/metadata.ts b/src/metadata.ts
index e627842d5ea..1d63b70633c 100755
--- a/src/metadata.ts
+++ b/src/metadata.ts
@@ -248,6 +248,11 @@ export interface MacOptions extends PlatformSpecificBuildOptions {
This option only applies when signing with `entitlements` provided.
*/
readonly entitlementsInherit?: string | null
+
+ /*
+ The `CFBundleVersion`. Do not use it unless [you need to](see (https://github.com/electron-userland/electron-builder/issues/565#issuecomment-230678643)).
+ */
+ readonly bundleVersion?: string | null
}
/*
diff --git a/src/platformPackager.ts b/src/platformPackager.ts
index 4276cd85bac..8569f93aeda 100644
--- a/src/platformPackager.ts
+++ b/src/platformPackager.ts
@@ -96,15 +96,14 @@ export abstract class PlatformPackager
readonly appInfo: AppInfo
constructor(public info: BuildInfo) {
- this.appInfo = info.appInfo
+ this.devMetadata = info.devMetadata
+ this.platformSpecificBuildOptions = this.normalizePlatformSpecificBuildOptions((info.devMetadata.build)[this.platform.buildConfigurationKey])
+ this.appInfo = this.prepareAppInfo(info.appInfo)
this.options = info.options
this.projectDir = info.projectDir
- this.devMetadata = info.devMetadata
this.buildResourcesDir = path.resolve(this.projectDir, this.relativeBuildResourcesDirname)
- this.platformSpecificBuildOptions = this.normalizePlatformSpecificBuildOptions((info.devMetadata.build)[this.platform.buildConfigurationKey])
-
this.resourceList = readdir(this.buildResourcesDir)
.catch(e => {
if (e.code !== "ENOENT") {
@@ -114,6 +113,10 @@ export abstract class PlatformPackager
})
}
+ protected prepareAppInfo(appInfo: AppInfo) {
+ return appInfo
+ }
+
normalizePlatformSpecificBuildOptions(options: DC | n): DC {
return options == null ? Object.create(null) : options
}
diff --git a/templates/linux/AppRun.sh b/templates/linux/AppRun.sh
index c59afdd9189..f159dd2bafb 100755
--- a/templates/linux/AppRun.sh
+++ b/templates/linux/AppRun.sh
@@ -43,7 +43,7 @@ trap atexit EXIT
# http://stackoverflow.com/questions/3190818
atexit()
{
-if [ $NUMBER_OF_ARGS -eq 0 ] ; then
+if [ "$NUMBER_OF_ARGS" -eq 0 ] ; then
# if [ -z $(which "gtk-launch") ] ; then
exec "${BIN}"
# else
@@ -172,29 +172,29 @@ if [ -z "$SKIP" ] ; then
# and to /usr/share/applications if run as root
# but that does not really work for me...
desktop-file-install --rebuild-mime-info-cache \
- --vendor=$VENDORPREFIX --set-key=Exec --set-value="${APPIMAGE} %U" \
+ --vendor=$VENDORPREFIX --set-key=Exec --set-value="$APPIMAGE %U" \
--set-key=X-AppImage-Comment --set-value="Generated by ${THIS}" \
- --set-icon="$VENDORPREFIX-$APP" --set-key=TryExec --set-value="${APPIMAGE}" "${DESKTOP_FILE}" \
+ --set-icon="$VENDORPREFIX-$APP" --set-key=TryExec --set-value="$APPIMAGE" "$DESKTOP_FILE" \
--dir "$DESTINATION_DIR_DESKTOP"
chmod a+x "$DESTINATION_DIR_DESKTOP/"*
RESOURCE_NAME=$(echo "$VENDORPREFIX-$DESKTOP_FILE_NAME" | sed -e 's/.desktop//g')
- echo ${RESOURCE_NAME}
+ echo "${RESOURCE_NAME}"
# Install the icon files for the application; TODO: scalable
- ICONS=$(find "${APPDIR}/usr/share/icons/" -path "*/apps/${APP}.png" || true)
+ ICONS=$(find "$APPDIR/usr/share/icons/" -path "*/apps/$APP.png" || true)
for ICON in $ICONS ; do
- ICON_SIZE=$(echo "${ICON}" | rev | cut -d "/" -f 3 | rev | cut -d "x" -f 1)
- xdg-icon-resource install --context apps --size ${ICON_SIZE} "${ICON}" "${RESOURCE_NAME}"
+ ICON_SIZE=$(echo "$ICON" | rev | cut -d "/" -f 3 | rev | cut -d "x" -f 1)
+ xdg-icon-resource install --context apps --size "$ICON_SIZE" "$ICON" "$RESOURCE_NAME"
done
# Install mime type
- find "${APPDIR}/usr/share/mime/" -type f -name *xml -exec xdg-mime install $SYSTEM_WIDE --novendor {} \; || true
+ find "$APPDIR/usr/share/mime/" -type f -name "*xml" -exec xdg-mime install ${SYSTEM_WIDE} --novendor {} \; || true
# Install the icon files for the mime type; TODO: scalable
ICONS=$(find "${APPDIR}/usr/share/icons/" -wholename "*/mimetypes/*.png" || true)
for ICON in $ICONS ; do
- ICON_SIZE=$(echo "${ICON}" | rev | cut -d "/" -f 3 | rev | cut -d "x" -f 1)
- xdg-icon-resource install --context mimetypes --size ${ICON_SIZE} "${ICON}" $(basename $ICON | sed -e 's/.png//g')
+ ICON_SIZE=$(echo "$ICON" | rev | cut -d "/" -f 3 | rev | cut -d "x" -f 1)
+ xdg-icon-resource install --context mimetypes --size "$ICON_SIZE" "$ICON" $(basename "$ICON" | sed -e 's/.png//g')
done
xdg-desktop-menu forceupdate
diff --git a/test/src/macPackagerTest.ts b/test/src/macPackagerTest.ts
index 23a64a7d794..c635615141d 100644
--- a/test/src/macPackagerTest.ts
+++ b/test/src/macPackagerTest.ts
@@ -28,7 +28,7 @@ function createTargetTest(target: Array, expectedContents: Array
devMetadata: {
build: {
mac: {
- target: target
+ target: target,
}
}
}
@@ -186,7 +186,7 @@ test.ifOsx("custom background - new way", () => {
})
})
-test.ifOsx("disable dmg icon", () => {
+test.ifOsx("disable dmg icon, bundleVersion", () => {
let platformPackager: CheckingMacPackager = null
return assertPack("test-app-one", {
targets: Platform.MAC.createTarget(),
@@ -195,13 +195,17 @@ test.ifOsx("disable dmg icon", () => {
build: {
dmg: {
icon: null,
- }
+ },
+ mac: {
+ bundleVersion: "50"
+ },
},
}
}, {
packed: () => {
assertThat(platformPackager.effectiveDistOptions.icon).equal(null)
assertThat(platformPackager.effectivePackOptions.icon).not.equal(null)
+ assertThat(platformPackager.effectivePackOptions["build-version"]).equal("50")
return BluebirdPromise.resolve(null)
},
})