Skip to content

Commit

Permalink
Merge pull request #36 from GalaxyPay/dev
Browse files Browse the repository at this point in the history
fix: delete plist
  • Loading branch information
acfunk authored Dec 18, 2024
2 parents d0cdca6 + e1bf90f commit e43db12
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -266,5 +266,5 @@ jobs:
uses: ncipollo/release-action@v1
with:
allowUpdates: true
tag: v2.2.1
tag: v2.2.2
artifacts: "Output/*"
2 changes: 1 addition & 1 deletion FUNC.iss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "FUNC"
#define MyAppVersion "2.2.1"
#define MyAppVersion "2.2.2"
#define MyAppPublisher "Galaxy Pay, LLC"
#define MyAppPublisherURL "https://galaxy-pay.com"
#define MyPublishPath "publish"
Expand Down
1 change: 1 addition & 0 deletions FUNC/Controllers/RetiController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ public async Task<ActionResult<string>> DeleteRetiService()
else if (IsMacOS())
{
await Utils.ExecCmd($"launchctl bootout system/func.reti");
await Utils.ExecCmd($"rm /Library/LaunchDaemons/func.reti.plist");
}

return Ok();
Expand Down
6 changes: 5 additions & 1 deletion FUNC/Node.cs
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,11 @@ public static async Task ControlService(string name, string cmd)
{
if (cmd == "start") await Utils.ExecCmd($"launchctl kickstart system/func.{name}");
else if (cmd == "stop") await Utils.ExecCmd($"launchctl kill 9 system/func.{name}");
else if (cmd == "delete") await Utils.ExecCmd($"launchctl bootout system/func.{name}");
else if (cmd == "delete")
{
await Utils.ExecCmd($"launchctl bootout system/func.{name}");
await Utils.ExecCmd($"rm /Library/LaunchDaemons/func.{name}.plist");
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion create-package-deb.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
rm -r Output

PKG=Output/func_2.2.1_linux-$1
PKG=Output/func_2.2.2_linux-$1

mkdir -p $PKG/lib/systemd/system
mkdir -p $PKG/opt/func
Expand Down
2 changes: 1 addition & 1 deletion create-package-pkg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ pkgbuild --root publish \
--install-location /opt/func \
--scripts pkg/scripts \
--identifier func.app \
Output/func_2.2.1_darwin-$1.pkg
Output/func_2.2.2_darwin-$1.pkg
2 changes: 1 addition & 1 deletion deb/amd64/control
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: func
Version: 2.2.1
Version: 2.2.2
Section: base
Priority: optional
Architecture: amd64
Expand Down
2 changes: 1 addition & 1 deletion deb/arm64/control
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: func
Version: 2.2.1
Version: 2.2.2
Section: base
Priority: optional
Architecture: arm64
Expand Down
2 changes: 1 addition & 1 deletion webui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "func-webui",
"version": "2.2.1",
"version": "2.2.2",
"scripts": {
"dev": "vite",
"build": "vue-tsc --noEmit && vite build",
Expand Down

0 comments on commit e43db12

Please sign in to comment.