diff --git a/OpenJibo/scripts/bootstrap/test-openjibo-routing.sh b/OpenJibo/scripts/bootstrap/test-openjibo-routing.sh old mode 100644 new mode 100755 diff --git a/OpenJibo/scripts/cloud/get-websocket-capture-summary.sh b/OpenJibo/scripts/cloud/get-websocket-capture-summary.sh old mode 100644 new mode 100755 index 9375c2e..639f587 --- a/OpenJibo/scripts/cloud/get-websocket-capture-summary.sh +++ b/OpenJibo/scripts/cloud/get-websocket-capture-summary.sh @@ -2,7 +2,8 @@ set -euo pipefail SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -CAPTURE_DIRECTORY="${1:-${SCRIPT_DIR}/../../src/Jibo.Cloud/dotnet/src/Jibo.Cloud.Api/bin/Debug/net10.0/captures/websocket}" +REPO_ROOT="$(cd "${SCRIPT_DIR}/../.." && pwd)" +CAPTURE_DIRECTORY="${1:-${REPO_ROOT}/captures/websocket}" if [[ ! -d "${CAPTURE_DIRECTORY}" ]]; then echo "No websocket capture directory found at ${CAPTURE_DIRECTORY}" diff --git a/OpenJibo/scripts/cloud/import-websocket-capture-fixture.py b/OpenJibo/scripts/cloud/import-websocket-capture-fixture.py old mode 100644 new mode 100755 diff --git a/OpenJibo/scripts/cloud/invoke-live-jibo-prep.sh b/OpenJibo/scripts/cloud/invoke-live-jibo-prep.sh old mode 100644 new mode 100755 index 91f61b4..b6edc6b --- a/OpenJibo/scripts/cloud/invoke-live-jibo-prep.sh +++ b/OpenJibo/scripts/cloud/invoke-live-jibo-prep.sh @@ -2,8 +2,9 @@ set -euo pipefail SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +REPO_ROOT="$(cd "${SCRIPT_DIR}/../.." && pwd)" BASE_URL="${BASE_URL:-https://localhost:5001}" -CAPTURE_DIRECTORY="${CAPTURE_DIRECTORY:-${SCRIPT_DIR}/../../src/Jibo.Cloud/dotnet/src/Jibo.Cloud.Api/bin/Debug/net10.0/captures/websocket}" +CAPTURE_DIRECTORY="${CAPTURE_DIRECTORY:-${REPO_ROOT}/captures/websocket}" EXPECTED_HOSTS=( "api.jibo.com" "api-socket.jibo.com" diff --git a/OpenJibo/scripts/cloud/start-dotnet-with-node-cert.sh b/OpenJibo/scripts/cloud/start-dotnet-with-node-cert.sh old mode 100644 new mode 100755 index 245d678..c404c15 --- a/OpenJibo/scripts/cloud/start-dotnet-with-node-cert.sh +++ b/OpenJibo/scripts/cloud/start-dotnet-with-node-cert.sh @@ -12,8 +12,10 @@ PFX_OUT="${PFX_OUT:-${REPO_ROOT}/.tmp/openjibo-dev-cert.pfx}" PFX_PASSWORD="${PFX_PASSWORD:-openjibo-dev-password}" ASPNETCORE_URLS="${ASPNETCORE_URLS:-https://0.0.0.0:443;http://0.0.0.0:24605}" DOTNET_ENVIRONMENT="${DOTNET_ENVIRONMENT:-Development}" +CAPTURE_DIRECTORY="${CAPTURE_DIRECTORY:-${REPO_ROOT}/captures/websocket}" mkdir -p "$(dirname "${PFX_OUT}")" +mkdir -p "${CAPTURE_DIRECTORY}" if [[ ! -f "${CERT_PEM}" ]]; then echo "Missing CERT_PEM: ${CERT_PEM}" >&2 @@ -56,12 +58,14 @@ export ASPNETCORE_URLS export DOTNET_ENVIRONMENT export ASPNETCORE_Kestrel__Certificates__Default__Path="${PFX_OUT}" export ASPNETCORE_Kestrel__Certificates__Default__Password="${PFX_PASSWORD}" +export OpenJibo__Telemetry__DirectoryPath="${CAPTURE_DIRECTORY}" echo "" echo "Starting OpenJibo .NET cloud" echo " - project: ${API_PROJECT}" echo " - urls: ${ASPNETCORE_URLS}" echo " - environment: ${DOTNET_ENVIRONMENT}" +echo " - captures: ${CAPTURE_DIRECTORY}" cd "${REPO_ROOT}" exec dotnet run --project "${API_PROJECT}" --no-launch-profile