From ed33f8a9389911fede169a1a70ee06341c0453c7 Mon Sep 17 00:00:00 2001
From: nickb <nickb@ssec.wisc.edu>
Date: Thu, 28 Jan 2021 16:49:32 +0000
Subject: [PATCH] consolidate the runtime under libexec too
---
buildbucket/package.sh | 4 ++--
gridded_glm/libexec/env.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/buildbucket/package.sh b/buildbucket/package.sh
index fd950e8..986df51 100755
--- a/buildbucket/package.sh
+++ b/buildbucket/package.sh
@@ -71,12 +71,12 @@ conda pack --n-threads $(nproc) -n build -o ${conda_tb}
# Build up our package directory
mkdir -p ${pkg_name}
cd ${pkg_name}
-mkdir -p bin opt/conda
+mkdir -p bin libexec/python_runtime
# Copy package scripts/data to package directory
cp $GGLM_DIR/PACKAGE_README.md ./README.md
cp $GGLM_DIR/bin/* ./bin/
# Untar the tarball so we can put things where we want
-tar -xz -C ./opt/conda -f ../${conda_tb}
+tar -xz -C ./libexec/python_runtime -f ../${conda_tb}
# Go back to original work directory
cd ..
diff --git a/gridded_glm/libexec/env.sh b/gridded_glm/libexec/env.sh
index 266e185..6ee195b 100644
--- a/gridded_glm/libexec/env.sh
+++ b/gridded_glm/libexec/env.sh
@@ -28,4 +28,4 @@ fi
unset PYTHONPATH
unset LD_LIBRARY_PATH
-export PATH=$CSPP_GEO_GGLM_HOME/bin:$CSPP_GEO_GGLM_HOME/opt/conda/bin:$PATH
\ No newline at end of file
+export PATH=$CSPP_GEO_GGLM_HOME/bin:$CSPP_GEO_GGLM_HOME/libexec/python_runtime/bin:$PATH
\ No newline at end of file
--
GitLab