From 4eec29a6393ed05cbdd6d98020cd517bfc26b064 Mon Sep 17 00:00:00 2001 From: Pascal Fischer Date: Thu, 25 May 2023 21:22:26 +0200 Subject: [PATCH] revert log writing --- release_files/darwin_pkg/postinstall | 41 ++++++++++++++-------------- release_files/darwin_pkg/preinstall | 8 +++--- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/release_files/darwin_pkg/postinstall b/release_files/darwin_pkg/postinstall index 39a18fa4d..a7bb95c0f 100755 --- a/release_files/darwin_pkg/postinstall +++ b/release_files/darwin_pkg/postinstall @@ -4,29 +4,28 @@ APP=/Applications/NetBird.app AGENT=/usr/local/bin/netbird LOG_FILE=/var/log/netbird/client_install.log -{ - echo "Installing NetBird..." - if test -d $APP; then - echo "NetBird app copied successfully." - else - echo "NetBird app could not be copied to the Applications folder." - exit 1 - fi +echo "Installing NetBird..." &>> $LOG_FILE - ln -s $APP/Contents/MacOS/netbird $AGENT - if test -f $AGENT; then - echo "NetBird binary linked successfully." - else - echo "NetBird could not create symlink to /usr/local/bin" - exit 1 - fi +if test -d $APP; then + echo "NetBird app copied successfully." &>> $LOG_FILE +else + echo "NetBird app could not be copied to the Applications folder." &>> $LOG_FILE + exit 1 +fi - $AGENT service install - $AGENT service start +ln -s $APP/Contents/MacOS/netbird $AGENT +if test -f $AGENT; then + echo "NetBird binary linked successfully." &>> $LOG_FILE +else + echo "NetBird could not create symlink to /usr/local/bin" &>> $LOG_FILE + exit 1 +fi - open $APP +$AGENT service install +$AGENT service start - echo "Finished Netbird installation successfully" - exit 0 # all good -} &>> $LOG_FILE +open $APP + +echo "Finished Netbird installation successfully" &>> $LOG_FILE +exit 0 # all good diff --git a/release_files/darwin_pkg/preinstall b/release_files/darwin_pkg/preinstall index dc630afd4..6c891a37c 100755 --- a/release_files/darwin_pkg/preinstall +++ b/release_files/darwin_pkg/preinstall @@ -2,7 +2,7 @@ LOG_FILE=/var/log/netbird/client_install.log -{ - echo "Preinstall complete" - exit 0 # all good -} &> $LOG_FILE +echo "Start installation..." &> $LOG_FILE +echo "Preinstall complete" &>> $LOG_FILE +exit 0 # all good +