Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix setup #22

Merged
merged 3 commits into from
Nov 22, 2024
Merged

Fix setup #22

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92262dc
build: add execution permissions
sof202 Nov 22, 2024
16e295f
fix: only show usage if -h or --help is argument
sof202 Nov 22, 2024
c65f21f
fix: only read CONDA_SHELL if previous path failed
sof202 Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Setup/setup
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ EOF
exit 0
}

if [ "$#" -eq 0 ]; then usage; fi
if [[ $1 == "-h" || $1 == "--help" ]]; then usage; fi

REPO_DIR=$(dirname "$0")/..

Expand Down Expand Up @@ -43,9 +43,8 @@ fi
CONDA_SHELL="${CONDA_EXE%/bin/conda}/etc/profile.d/conda.sh"
source "${CONDA_SHELL}" || { echo "Could not find conda shell at:
${CONDA_SHELL}. Please provide the path to this file
(.../conda/etc/profile.d/conda.sh"; }
(.../conda/etc/profile.d/conda.sh"; read -r CONDA_SHELL; }

read -r CONDA_SHELL
source "${CONDA_SHELL}" || { echo "Could not find conda shell at:
${CONDA_SHELL}"; exit 1; }

Expand Down