Use prebuilt binary from 3rd-prebuilt for MacOS installer

.github/workflows/deploy.yml

@@ -43,7 +43,6 @@ jobs:
         export QIF_BIN_DIR=${{ runner.temp }}/Qt/Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin
         ls client/3rd-prebuilt
         echo "***"
-        ls deploy/data/deploy-prebuilt
         bash deploy/build_linux.sh
 
     - name: 'Upload installer artifact'

deploy/build_linux.sh

@@ -28,7 +28,7 @@ APP_FILENAME=$APP_NAME.app
 APP_DOMAIN=org.amneziavpn.package
 
 DEPLOY_DATA_DIR=$PROJECT_DIR/deploy/data/linux
-PREBUILT_DEPLOY_DATA_DIR=$PROJECT_DIR/deploy/deploy-prebuilt/linux/client/bin
+PREBUILT_DEPLOY_DATA_DIR=$PROJECT_DIR/client/3rd-prebuilt/deploy-prebuilt/linux/client/bin
 INSTALLER_DATA_DIR=$PROJECT_DIR/deploy/installer/packages/$APP_DOMAIN/data
 
 PRO_FILE_PATH=$PROJECT_DIR/$APP_NAME.pro
@@ -63,7 +63,7 @@ cmake --build . --config release
 #echo "............Deploy.................."
 
 cp -r $DEPLOY_DATA_DIR/* $APP_DIR
-cp -r PREBUILT_DEPLOY_DATA_DIR=$PROJECT_DIR/deploy/deploy-prebuilt/linux/client/bin/* $APP_DIR
+cp -r $PREBUILT_DEPLOY_DATA_DIR $APP_DIR
 
 if [ ! -f $CQTDEPLOYER_DIR/cqtdeployer.sh ]; then
   wget -O $TOOLS_DIR/CQtDeployer.zip https://github.com/QuasarApp/CQtDeployer/releases/download/v1.5.4.17/CQtDeployer_1.5.4.17_Linux_x86_64.zip

deploy/build_macos.sh

@@ -28,7 +28,9 @@ PLIST_NAME=$APP_NAME.plist
 OUT_APP_DIR=$BUILD_DIR/client
 BUNDLE_DIR=$OUT_APP_DIR/$APP_FILENAME
 
+PREBUILT_DEPLOY_DATA_DIR=$PROJECT_DIR/deploy/data/deploy-prebuilt/macos
 DEPLOY_DATA_DIR=$PROJECT_DIR/deploy/data/macos
+
 INSTALLER_DATA_DIR=$BUILD_DIR/installer/packages/$APP_DOMAIN/data
 INSTALLER_BUNDLE_DIR=$BUILD_DIR/installer/$APP_FILENAME
 
@@ -114,6 +116,7 @@ fi
 echo "Packaging installer..."
 mkdir -p $INSTALLER_DATA_DIR
 cp -av $PROJECT_DIR/deploy/installer $BUILD_DIR
+cp -r $PREBUILT_DEPLOY_DATA_DIR/* $DEPLOY_DATA_DIR
 cp -av $DEPLOY_DATA_DIR/post_install.sh $INSTALLER_DATA_DIR/post_install.sh
 cp -av $DEPLOY_DATA_DIR/post_uninstall.sh $INSTALLER_DATA_DIR/post_uninstall.sh
 cp -av $DEPLOY_DATA_DIR/$PLIST_NAME $INSTALLER_DATA_DIR/$PLIST_NAME