From 68d02cc14f92a7059f4b1741ad0ac4a976fe7418 Mon Sep 17 00:00:00 2001 From: mlsmaycon Date: Wed, 25 May 2022 10:11:09 +0200 Subject: [PATCH] use direct sh shebang and stage location --- client/ui/netbird-ui.rb.tmpl | 9 +++++---- release_files/darwin-ui-installer.sh | 2 +- release_files/darwin-ui-uninstaller.sh | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/client/ui/netbird-ui.rb.tmpl b/client/ui/netbird-ui.rb.tmpl index d7b7278af..f268173ed 100644 --- a/client/ui/netbird-ui.rb.tmpl +++ b/client/ui/netbird-ui.rb.tmpl @@ -15,17 +15,18 @@ cask "{{ $projectName }}" do app "netbird_ui_darwin_arm64", target: "Netbird UI.app" end - depends_on formula: "netbird" + postflight do + set_permissions "/Applications/netclient", '0755' + end installer script: { - executable: "installer.sh", + executable: "#{staged_path}/netbird_ui_darwin_amd64/installer.sh", sudo: true, must_succeed: false, } uninstall script: { - executable: "uninstaller.sh", - args: ["service","stop"], + executable: "#{staged_path}/netbird_ui_darwin_amd64/uninstaller.sh", } name "Netbird UI" diff --git a/release_files/darwin-ui-installer.sh b/release_files/darwin-ui-installer.sh index 027a06fde..5add30247 100644 --- a/release_files/darwin-ui-installer.sh +++ b/release_files/darwin-ui-installer.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/bin/sh # check if wiretrustee is installed WT_BIN=$(which wiretrustee) diff --git a/release_files/darwin-ui-uninstaller.sh b/release_files/darwin-ui-uninstaller.sh index 681bdc32a..8cc4b8af7 100644 --- a/release_files/darwin-ui-uninstaller.sh +++ b/release_files/darwin-ui-uninstaller.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/bin/sh # check if netbird is installed NB_BIN=$(which netbird)