From be76d0b8a96b23793ffb4d8686bf4564698250d7 Mon Sep 17 00:00:00 2001 From: Dmitry Puzyrkov <dmitry.puzyrkov@demlabs.net> Date: Thu, 17 Aug 2023 09:38:19 +0000 Subject: [PATCH] [*] osx install scripts: copy instead of move --- cellframe-sdk | 2 +- dap-sdk | 2 +- os/macos/PKGINSTALL/postinstall | 9 ++++++--- version.mk | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cellframe-sdk b/cellframe-sdk index e3617ae9d..a6688c4a9 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit e3617ae9dbe38cb1c4c14d0b551c2b668e6896eb +Subproject commit a6688c4a9de4b5857ef4d6b6f658531d9abd9e0e diff --git a/dap-sdk b/dap-sdk index 992051a80..049e297d1 160000 --- a/dap-sdk +++ b/dap-sdk @@ -1 +1 @@ -Subproject commit 992051a80e276d6d54f0f1c63f3947bbcc9c8496 +Subproject commit 049e297d18d6be6bc5afa531aa363ce8522c9fa5 diff --git a/os/macos/PKGINSTALL/postinstall b/os/macos/PKGINSTALL/postinstall index 0b70d3e46..eaba0ffaa 100755 --- a/os/macos/PKGINSTALL/postinstall +++ b/os/macos/PKGINSTALL/postinstall @@ -11,8 +11,11 @@ sudo killall -HUP mDNSResponder EXEC_PREFIX=/Applications/$APP_NAME.app/Contents/Resources mkdir -p $DAP_PREFIX -sudo mv -f /Applications/$APP_NAME.app/Contents/Resources/etc $DAP_PREFIX -sudo mv -f /Applications/$APP_NAME.app/Contents/Resources/share $DAP_PREFIX +mkdir -p $DAP_PREFIX/etc +mkdir -p $DAP_PREFIX/share + +sudo cp -rf /Applications/$APP_NAME.app/Contents/Resources/etc/* $DAP_PREFIX/etc +sudo cp -rf /Applications/$APP_NAME.app/Contents/Resources/share/* $DAP_PREFIX/share wd=$(pwd) cd $EXEC_PREFIX/../MacOS @@ -42,7 +45,7 @@ rm -r /Users/$USER/Applications/"$APP_NAME".app/Contents/Resources/var/lib/globa sudo -u $USER launchctl start $NODE -sudo rm $EXEC_PREFIX/*.sh +#sudo rm $EXEC_PREFIX/*.sh echo "node agent: $(launchctl list | grep cell)" > /tmp/cellframe-dashboard_install_logs.txt diff --git a/version.mk b/version.mk index 204b9c3c8..eb18b53fd 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ VERSION_MAJOR=5 VERSION_MINOR=2 -VERSION_PATCH=273 +VERSION_PATCH=274 -- GitLab