From eb6ed37debc6b0639eeb08a37ddde031e6d54fa8 Mon Sep 17 00:00:00 2001
From: Josh Spicer <josh@joshspicer.com>
Date: Thu, 26 May 2022 01:32:41 +0000
Subject: fix anaconda pathing
---
src/anaconda/feature.json | 8 +++++++-
src/anaconda/install.sh | 7 ++++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/anaconda/feature.json b/src/anaconda/feature.json
index 7af90cd..f733b63 100644
--- a/src/anaconda/feature.json
+++ b/src/anaconda/feature.json
@@ -4,11 +4,17 @@
"options": {
"version": {
"type": "string",
- "proposals": ["latest"],
+ "proposals": [
+ "latest"
+ ],
"default": "latest",
"description": "Select or enter an anaconda version."
}
},
+ "containerEnv": {
+ "CONDA_DIR": "/usr/local/conda",
+ "PATH": "${CONDA_DIR}/bin:${PATH}"
+ },
"install": {
"app": "",
"file": "install.sh"
diff --git a/src/anaconda/install.sh b/src/anaconda/install.sh
index c77d98d..9c5706f 100644
--- a/src/anaconda/install.sh
+++ b/src/anaconda/install.sh
@@ -10,9 +10,10 @@
# Syntax: ./anaconda-debian.sh [Conda version] [CONDA_DIR] [Non-root user] [Add rc files flag]
VERSION=${1:-"latest"}
-export CONDA_DIR=${2:-"/usr/local/conda"}
-USERNAME=${3:-"automatic"}
-UPDATE_RC=${4:-"true"}
+USERNAME=${2:-"automatic"}
+UPDATE_RC=${3:-"true"}
+
+CONDA_DIR=${CONDA_DIR:-"/usr/local/conda"}
set -eux
export DEBIAN_FRONTEND=noninteractive
--
cgit v1.2.3