🐛 Bug fixes for MacOS not working

This commit is contained in:
Florian Metz
2020-01-26 05:09:15 +01:00
parent 85b16aa6b9
commit 5953a74e8d
4 changed files with 10 additions and 21 deletions

View File

@@ -73,7 +73,6 @@ jobs:
tsc util/uploadFile util/zip
node util/uploadFile installer_assets/update.ini /home/PreMiD/download/util/update.ini
node util/uploadFile dist/installer/upgrader.exe /home/PreMiD/download/upgrader.exe
node util/zip dist/installer/upgrader.app dist/installer/upgrader.app.zip --zip
node util/uploadFile dist/installer/upgrader.app.zip /home/PreMiD/download/util/upgrader.app.zip
- name: Finalize build
uses: appleboy/ssh-action@master

View File

@@ -191,7 +191,7 @@
<httpGet>
<customErrorMessage>${platform_name}</customErrorMessage>
<filename>${system_temp_directory}/PreMiD-release.zip</filename>
<url>https://dl.premid.app/PreMiD-osx.zip</url>
<url>https://dl.premid.app/PreMiD-darwin-x64.zip</url>
<ruleList>
<platformTest>
<type>osx</type>
@@ -316,6 +316,7 @@
</postUninstallationActionList>
<checkForUpdates>1</checkForUpdates>
<compressionAlgorithm>lzham-ultra</compressionAlgorithm>
<createOsxBundleZip>1</createOsxBundleZip>
<defaultInstallationMode>unattended</defaultInstallationMode>
<description>Rich Presence for web services.</description>
<disableSplashScreen>1</disableSplashScreen>
@@ -327,6 +328,7 @@
<licenseFileEncoding>utf-8</licenseFileEncoding>
<osxApplicationBundleIcon>appIcon.icns</osxApplicationBundleIcon>
<osxApplicationBundleIdentifier>eu.Timeraa.PreMiD</osxApplicationBundleIdentifier>
<osxPlatforms>osx-intel osx-x86_64</osxPlatforms>
<osxUninstallerApplicationBundleIcon>appIcon.icns</osxUninstallerApplicationBundleIcon>
<outputDirectory>../dist/installer</outputDirectory>
<overwritePolicy>onlyIfNewer</overwritePolicy>

View File

@@ -2,7 +2,7 @@
<shortName>PreMiD</shortName>
<fullName>PreMiD</fullName>
<version>latest</version>
<installerFilename>${product_shortname}-${platform_name}-installer.${platform_exec_suffix}</installerFilename>
<installerFilename>${product_shortname}-installer.${platform_exec_suffix}</installerFilename>
<debugLevel>0</debugLevel>
<licenseFile>../LICENSE</licenseFile>
<leftImage>leftSide.png</leftImage>
@@ -93,17 +93,6 @@
</startMenuShortcutList>
</component>
</componentList>
<initializationActionList>
<setInstallerVariable>
<name>project.installationType</name>
<value>upgrade</value>
<ruleList>
<fileExists>
<path>${installdir}</path>
</fileExists>
</ruleList>
</setInstallerVariable>
</initializationActionList>
<preInstallationActionList>
<actionGroup>
<progressText>Killing ${product_fullname}...</progressText>
@@ -140,7 +129,7 @@
<readyToInstallActionList>
<actionGroup>
<actionList>
<!-- Remove the old ARP Entry
<!-- Remove the old ARP Entry
Get the old version -->
<registryGet>
<key>HKEY_LOCAL_MACHINE\Software\${project.windowsSoftwareRegistryPrefix}</key>
@@ -190,7 +179,7 @@
<httpGet>
<customErrorMessage>${platform_name}</customErrorMessage>
<filename>${system_temp_directory}/PreMiD-release.zip</filename>
<url>https://dl.premid.app/PreMiD-osx.zip</url>
<url>https://dl.premid.app/PreMiD-darwin-x64.zip</url>
<ruleList>
<platformTest>
<type>osx</type>
@@ -287,6 +276,7 @@
</actionGroup>
</postUninstallationActionList>
<compressionAlgorithm>lzham-ultra</compressionAlgorithm>
<createOsxBundleZip>1</createOsxBundleZip>
<description>Rich Presence for web services.</description>
<disableSplashScreen>1</disableSplashScreen>
<enableRollback>0</enableRollback>
@@ -296,6 +286,7 @@
<licenseFileEncoding>utf-8</licenseFileEncoding>
<osxApplicationBundleIcon>appIcon.icns</osxApplicationBundleIcon>
<osxApplicationBundleIdentifier>eu.Timeraa.PreMiD</osxApplicationBundleIdentifier>
<osxPlatforms>osx-intel osx-x86_64</osxPlatforms>
<osxUninstallerApplicationBundleIcon>appIcon.icns</osxUninstallerApplicationBundleIcon>
<outputDirectory>../dist/installer</outputDirectory>
<overwritePolicy>onlyIfNewer</overwritePolicy>
@@ -361,11 +352,6 @@
<value>true</value>
<default>true</default>
<displayStyle>checkbox-left</displayStyle>
<ruleList>
<platformTest>
<type>windows</type>
</platformTest>
</ruleList>
</booleanParameter>
<labelParameter>
<name>extra</name>

View File

@@ -8,4 +8,6 @@
<enableSslSupport>1</enableSslSupport>
<outputDirectory>../dist/app/</outputDirectory>
<installerFilename>updater.${platform_exec_suffix}</installerFilename>
<osxPlatforms>osx-intel osx-x86_64</osxPlatforms>
<createOsxBundleZip>1</createOsxBundleZip>
</autoUpdateProject>