Replaced macOS bundle with .command file

This commit is contained in:
PaddiM8 2020-12-12 23:08:50 +01:00
parent 660b9dcc8b
commit 8f48098700
3 changed files with 11 additions and 10 deletions

View File

@ -45,25 +45,23 @@ jobs:
- uses: actions/cache@v2
with:
path: |
~/.cargo/bin/cargo-bundle
~/.cargo/registry/index
~/.cargo/registry/cache
target
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
- name: Compile
run: |
[ ! -f ~/.cargo/bin/cargo-bundle ] && cargo install cargo-bundle
cd kalk_cli
~/.cargo/bin/cargo-bundle bundle --release --bin kalk
mv ../target/release/kalk ../target/release/kalk-macOS-cli
cd ../target/release/bundle/osx/kalk.app
zip -r kalk-macOS.zip kalk.app
cargo build --release --verbose
chmod +x run.command
mkdir kalk-macOS
mv run.command kalk-macOS
mv target/release/kalk kalk-macOS
zip -r kalk-macOS.zip kalk-macOS
- uses: actions/upload-artifact@v2
with:
name: binaries
path: |
target/release/bundle/osx/kalk-macOS.zip
target/release/kalk-macOS-cli
release_windows:
name: release windows

3
kalk_cli/run.command Normal file
View File

@ -0,0 +1,3 @@
#!/bin/sh
cd "$(dirname $BASH_SOURCE)"
./kalk

View File

@ -47,7 +47,7 @@
<DirectoryRef Id="KalkProgramMenu">
<!-- Application shortcut -->
<Component Id="KalkShortcut" Guid="aa36e61a-23cd-4383-b744-2f78e912f0dc" Win64='$(var.Win64)'>
<Component Id="KalkShortcut" Guid="b1a06364-9af2-4864-94c4-e3985906c39f" Win64='$(var.Win64)'>
<Shortcut Id="KalkShortcutFile" Name="Kalk" Description="A calculator" Target="[KalkProgramFiles]kalk.exe"/>
<RemoveFolder Id="KalkProgramMenu" On="uninstall"/>
<RegistryValue Root="HKCU" Key="Software\Microsoft\kalk" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
@ -56,7 +56,7 @@
<DirectoryRef Id="KalkProgramFiles">
<!-- Add to PATH -->
<Component Id="ModifyPathEnv" Guid="edf0b679-9eb6-46f7-a5d1-5160f30acb34" KeyPath="yes" Win64='$(var.Win64)'>
<Component Id="ModifyPathEnv" Guid="732b94ae-608a-45fd-a0b3-d2896b6ef3b8" KeyPath="yes" Win64='$(var.Win64)'>
<Environment Id="PathEnv" Value="[KalkProgramFiles]" Name="PATH" Permanent="no" Part="first" Action="set" System="yes"/>
</Component>
</DirectoryRef>