diff --git a/tvb_build/build_from_conda.py b/tvb_build/build_from_conda.py index 3e26ce09ba..573862f5b6 100644 --- a/tvb_build/build_from_conda.py +++ b/tvb_build/build_from_conda.py @@ -86,7 +86,7 @@ def win64(): 'bin\\tvb_stop.bat': 'distribution stop', 'bin\\jupyter_notebook.bat': set_path + 'cd ..\\bin\n..\\tvb_data\\Scripts\\jupyter lab ..\\demo_scripts', 'demo_scripts\\jupyter_notebook.bat': set_path + 'cd ..\\demo_scripts\n..\\tvb_data\\Scripts\\jupyter lab', - 'bin\\activate_tvb_env.bat':'REM Conda must be installed before running this script \n conda activate ./tvb_data \n cmd /K' + 'bin\\activate_tvb_env.bat':'REM Conda must be installed before running this script \n conda activate ../tvb_data \n cmd /K' } return Config("Windows", "C:\\miniconda\\envs\\tvb-run", @@ -116,7 +116,7 @@ def linux64(): 'bin/tvb_stop.sh': 'bash ./distribution.sh stop', 'bin/jupyter_notebook.sh': set_path + 'cd ../bin\n../tvb_data/bin/python -m jupyterlab ../demo_scripts', 'demo_scripts/jupyter_notebook.sh': set_path + 'cd ../demo_scripts\n../tvb_data/bin/python -m jupyterlab', - 'bin/activate_tvb_env.sh': '# Conda must be installed before running this script \n conda activate ./tvb_data \n $SHELL' + 'bin/activate_tvb_env.sh': '# Conda must be installed before running this script \n conda activate ../tvb_data \n $SHELL' } return Config("Linux", "/opt/conda/envs/tvb-run", join("lib", Environment.PYTHON_FOLDER, "site-packages"), diff --git a/tvb_build/setup_mac.py b/tvb_build/setup_mac.py index 5e8d927bc6..025df24351 100644 --- a/tvb_build/setup_mac.py +++ b/tvb_build/setup_mac.py @@ -257,7 +257,7 @@ def prepare_mac_dist(): _create_command_file(os.path.join(DIST_FOLDER, "bin", 'tvb_stop'), 'source ./distribution.command stop', 'Stopping TVB related processes.', True) _create_command_file(os.path.join(DIST_FOLDER, "bin", 'activate_tvb_env'), - 'conda activate ./tvb_data \n $SHELL', 'Conda must be installed before running this script', True) + 'conda activate ../tvb_data \n $SHELL', 'Conda must be installed before running this script', True) jupyter_command = '/Applications/{}/Contents/Resources/bin/jupyter lab '.format(APP) _create_command_file(os.path.join(DIST_FOLDER, "bin", 'jupyter_notebook'), jupyter_command + '../demo_scripts', 'Launching IPython Notebook from TVB Distribution')