Skip to content
Snippets Groups Projects
Commit 09cf0c27 authored by François  LAURENT's avatar François LAURENT
Browse files

first fixes for macOS

parent 60854019
No related branches found
No related tags found
1 merge request!18Set of commits to be tagged v0.18.3
Pipeline #131540 passed
...@@ -97,16 +97,16 @@ Alternatively, tags can be similarly *un*assigned at individual time steps or ov ...@@ -97,16 +97,16 @@ Alternatively, tags can be similarly *un*assigned at individual time steps or ov
On macOS and Linux, a [script](https://gitlab.pasteur.fr/nyx/larvatagger.jl/-/blob/dev/scripts/install.sh?ref_type=heads) is provided to automate the installation process from source. This script installs LarvaTagger.jl and Julia if missing. It also adds the *larvatagger* command to the user's path variable. On macOS and Linux, a [script](https://gitlab.pasteur.fr/nyx/larvatagger.jl/-/blob/dev/scripts/install.sh?ref_type=heads) is provided to automate the installation process from source. This script installs LarvaTagger.jl and Julia if missing. It also adds the *larvatagger* command to the user's path variable.
The *scripts/install.sh* script can be run with: The *scripts/install.sh* script can be run with:
``` ```
curl -sSL https://gitlab.pasteur.fr/nyx/larvatagger.jl/-/raw/dev/scripts/install.sh?ref_type=heads&inline=false | sh curl -sSL "https://gitlab.pasteur.fr/nyx/larvatagger.jl/-/raw/dev/scripts/install.sh?ref_type=heads&inline=false" | sh
``` ```
To install the full LarvaTagger suite, run instead: To install the full LarvaTagger suite, run instead:
``` ```
curl -sSL https://gitlab.pasteur.fr/nyx/larvatagger.jl/-/raw/dev/scripts/install.sh?ref_type=heads&inline=false | sh -s -- --with-default-backend curl -sSL "https://gitlab.pasteur.fr/nyx/larvatagger.jl/-/raw/dev/scripts/install.sh?ref_type=heads&inline=false" | sh -s -- --with-default-backend
``` ```
In the latter case, the script may install several additional dependencies, including Python 3.8 and Poetry. On macOS, this should be fully automatic. In contrast, Linux users may be offered several options to be manually performed: `pyenv` is one way, `python3.8` and `python3.8-venv` is another. In the latter case, the script may install several additional dependencies, including Python 3.8 and Poetry. On macOS, this should be fully automatic. In contrast, Linux users may be offered several options to be manually performed: `pyenv` is one way, `python3.8` and `python3.8-venv` is another.
This script can also uninstall LarvaTagger (if installed with the same script) with: `curl -sSL https://gitlab.pasteur.fr/nyx/larvatagger.jl/-/raw/dev/scripts/install.sh?ref_type=heads&inline=false | sh -s -- --uninstall` which can be useful for example prior to reinstalling after failure. This script can also uninstall LarvaTagger (if installed with the same script) with: `curl -sSL "https://gitlab.pasteur.fr/nyx/larvatagger.jl/-/raw/dev/scripts/install.sh?ref_type=heads&inline=false" | sh -s -- --uninstall` which can be useful for example prior to reinstalling after failure.
### Manually from source ### Manually from source
......
...@@ -34,7 +34,11 @@ if ! command -v julia 1>/dev/null 2>&1; then ...@@ -34,7 +34,11 @@ if ! command -v julia 1>/dev/null 2>&1; then
JULIA_INSTALL_ARGS=-y JULIA_INSTALL_ARGS=-y
fi fi
curl -fsSL https://install.julialang.org | sh -s -- $JULIA_INSTALL_ARGS curl -fsSL https://install.julialang.org | sh -s -- $JULIA_INSTALL_ARGS
if [ -f ~/.bashrc ]; then
source ~/.bashrc source ~/.bashrc
elif [ -f ~/.bash_profile ]; then
source ~/.bash_profile
fi
fi fi
for arg in "$@"; do for arg in "$@"; do
...@@ -156,7 +160,11 @@ if ! command -v larvatagger 1>/dev/null 2>&1; then ...@@ -156,7 +160,11 @@ if ! command -v larvatagger 1>/dev/null 2>&1; then
if [ "$SHELL" = "/bin/zsh" ]; then if [ "$SHELL" = "/bin/zsh" ]; then
rcfile=~/.zshrc rcfile=~/.zshrc
elif [ "$SHELL" = "/bin/bash" ]; then elif [ "$SHELL" = "/bin/bash" ]; then
if [ -f ~/.bashrc ]; then
rcfile=~/.bashrc rcfile=~/.bashrc
elif [ -f ~/.bash_profile ]; then
rcfile=~/.bash_profile
fi
fi fi
cat <<"EOF" >>$rcfile cat <<"EOF" >>$rcfile
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment