opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7556 from jmchilton/expression_tools

Browse Source 
Implement expression tools and non-data tool outputs.
This commit is contained in:
Martin Cech
2019-03-20 18:52:59 -04:00
committed by GitHub
parent ead42bb9fd ee078d315c
commit e65604bc06
34 changed files with 787 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/common_startup.sh
+13 -4
View File
@@ -224,14 +224,23 @@ if [ $SKIP_CLIENT_BUILD -eq 0 ]; then
fi
fi
# Install node if not installed
if [ -n "$VIRTUAL_ENV" ]; then
if ! in_venv "$(command -v node)" || [ "$(node --version)" != "v$NODE_VERSION" ]; then
echo "Installing node into $VIRTUAL_ENV with nodeenv."
nodeenv -n $NODE_VERSION -p
fi
elif [ -n "$CONDA_DEFAULT_ENV" -a -n "$CONDA_EXE" ]; then
if ! in_conda_env "$(command -v node)"; then
echo "Installing node into '$CONDA_DEFAULT_ENV' Conda environment with conda."
$CONDA_EXE install --yes --override-channels --channel conda-forge --channel defaults --name $CONDA_DEFAULT_ENV node=$NODE_VERSION
fi
fi
# Build client if necessary.
if [ $SKIP_CLIENT_BUILD -eq 0 ]; then
# Ensure dependencies are installed
if [ -n "$VIRTUAL_ENV" ]; then
if ! in_venv "$(command -v node)" || [ "$(node --version)" != "v$NODE_VERSION" ]; then
echo "Installing node into $VIRTUAL_ENV with nodeenv."
nodeenv -n $NODE_VERSION -p
fi
if ! in_venv "$(command -v yarn)"; then
echo "Installing yarn into $VIRTUAL_ENV with npm."
npm install --global yarn