Skip to content

Commit

Permalink
0.5.10
Browse files Browse the repository at this point in the history
  • Loading branch information
ilan committed Mar 28, 2023
1 parent d03cefc commit 87a1e53
Show file tree
Hide file tree
Showing 7 changed files with 773 additions and 614 deletions.
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,16 @@

# Unreleased



# [0.5.10] (2023-03-25)

- Drop support for installation of `'docker', 'pipx', 'shellcheck'` in **Install XSOAR local development environment**.
- Selecting `python` in **Install XSOAR local development environment** will install the latest version of `python3` and the latest version of `python2` using `pyenv`.
- Selecting `poetry` in **Install XSOAR local development environment** will install the latest version of `poetry` using the official installation script.
- Demisto-SDK commands will now run from the `poetry` environment, if available.
- Demisto-SDK commands will now run from the `content` path, if available.
- Added options to **Install/Update Demisto-SDK**, to install using poetry or pip.

# [0.5.9] (2023-01-25)

- Fixed an issue where Dev Container fails to open in arm64 architecture.
Expand Down
34 changes: 7 additions & 27 deletions Scripts/setup_dependencies.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
#!/bin/bash
set -e

# workaround to support M1 and Linux
export PATH=/opt/homebrew/bin:/home/linuxbrew/.linuxbrew/bin:"$PATH"

dependencies=$1

# if empty dependencies
Expand All @@ -12,27 +9,9 @@ if [ -z "$dependencies" ]; then
exit 0
fi

# check if brew installed
if ! [ -x "$(command -v brew)" ]; then
echo "Please install Homebrew first to install dependencies. Homebrew installation command:"
echo '/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"'
exit 1
fi
brew update
# check if "docker" in dependencies
if [[ $dependencies == *"docker"* ]]; then
brew install --cask docker || echo "Install Docker manually"
fi

if [[ $dependencies == *"python"* ]]; then
brew install python@3.10 || echo "Install python manually"
fi


brew install $dependencies || true

if [[ $dependencies == *"pyenv"* ]]; then
# If pyenv not already exists in zshrc, add it
curl https://pyenv.run | bash || true
export PYENV_ROOT="$HOME/.pyenv";
export PATH="$PYENV_ROOT/bin":$PATH;
eval "$(pyenv init -)"
Expand All @@ -43,8 +22,9 @@ if [[ $dependencies == *"pyenv"* ]]; then
pyenv install 2.7.18 --force
pyenv global $LATEST_PYTHON 2.7.18;
fi
# check if python is availible
if ! [ -x "$(command -v python)" ]; then
echo "Python is not availible. setting poetry to python3"
poetry env use python3 || poetry env use /home/linuxbrew/.linuxbrew/bin/python3 || true
fi

if [[ $dependencies == *"poetry" ]]
then
echo "Installing poetry"
curl -sSL https://install.python-poetry.org | python3 -
fi
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "xsoar",
"displayName": "Cortex XSOAR",
"description": "Build, Format, and Validate Cortex XSOAR with ease.",
"version": "0.5.9",
"version": "0.5.10",
"engines": {
"vscode": "^1.54.0"
},
Expand Down
Loading

0 comments on commit 87a1e53

Please sign in to comment.