From 91bf8a7fccc42192819642287c655ab4dee6f469 Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Thu, 23 Nov 2017 09:34:11 +0100 Subject: [PATCH] Rename conda activation and deactivation scripts --- Makefile.am | 6 +++--- dev/00-ctools-deactivate.sh | 4 ++++ dev/01-ctools-activate.sh | 4 ++++ dev/ctools-activate.sh | 4 ---- dev/ctools-deactivate.sh | 4 ---- 5 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 dev/00-ctools-deactivate.sh create mode 100644 dev/01-ctools-activate.sh delete mode 100644 dev/ctools-activate.sh delete mode 100644 dev/ctools-deactivate.sh diff --git a/Makefile.am b/Makefile.am index b696ed6..0b35481 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,9 +33,9 @@ pkgconfig_DATA = ctools.pc # Conda activate directory condaactivatedir = $(sysconfdir)/conda/activate.d -condaactivate_DATA = dev/ctools-activate.sh +condaactivate_DATA = dev/01-ctools-activate.sh condadeactivatedir = $(sysconfdir)/conda/deactivate.d -condadeactivate_DATA = dev/ctools-deactivate.sh +condadeactivate_DATA = dev/00-ctools-deactivate.sh # Manual pages to install man_MANS = @@ -54,7 +54,7 @@ docdir = ${datadir}/doc/${PACKAGE} EXTRA_DIST = README.md \ doc/Doxyfile doc/source \ dev/testreport.py \ - dev/ctools-activate.sh dev/ctools-deactivate.sh \ + dev/01-ctools-activate.sh dev/00-ctools-deactivate.sh \ dev/conda.recipe/build.sh \ dev/conda.recipe/conda_build_config.yaml \ dev/conda.recipe/meta.yaml.in diff --git a/dev/00-ctools-deactivate.sh b/dev/00-ctools-deactivate.sh new file mode 100644 index 0000000..de3421a --- /dev/null +++ b/dev/00-ctools-deactivate.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +unset CTOOLS +unset CALDB diff --git a/dev/01-ctools-activate.sh b/dev/01-ctools-activate.sh new file mode 100644 index 0000000..c96b1f1 --- /dev/null +++ b/dev/01-ctools-activate.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +export CTOOLS=${CONDA_PREFIX} +source ${CTOOLS}/bin/ctools-init.sh diff --git a/dev/ctools-activate.sh b/dev/ctools-activate.sh deleted file mode 100644 index c96b1f1..0000000 --- a/dev/ctools-activate.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -export CTOOLS=${CONDA_PREFIX} -source ${CTOOLS}/bin/ctools-init.sh diff --git a/dev/ctools-deactivate.sh b/dev/ctools-deactivate.sh deleted file mode 100644 index de3421a..0000000 --- a/dev/ctools-deactivate.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -unset CTOOLS -unset CALDB -- libgit2 0.21.4