From b4fef858ff09d9b00fa5a09eaa882a5582224f51 Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Thu, 23 Nov 2017 09:31:39 +0100 Subject: [PATCH] Rename conda activation and deactivation scripts --- Makefile.am | 8 ++++---- dev/00-gammalib-activate.sh | 4 ++++ dev/01-gammalib-deactivate.sh | 3 +++ dev/gammalib-activate.sh | 4 ---- dev/gammalib-deactivate.sh | 3 --- 5 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 dev/00-gammalib-activate.sh create mode 100644 dev/01-gammalib-deactivate.sh delete mode 100644 dev/gammalib-activate.sh delete mode 100644 dev/gammalib-deactivate.sh diff --git a/Makefile.am b/Makefile.am index 0b58a87..cb26e4c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ############################################################################# # Makefile.am for GammaLib package # # ------------------------------------------------------------------------- # -# Copyright (C) 2016 Juergen Knoedlseder # +# Copyright (C) 2016-2017 Juergen Knoedlseder # # ------------------------------------------------------------------------- # # # # This program is free software: you can redistribute it and/or modify # @@ -38,9 +38,9 @@ pkgconfig_DATA = gammalib.pc # Conda activate directory condaactivatedir = $(sysconfdir)/conda/activate.d -condaactivate_DATA = dev/gammalib-activate.sh +condaactivate_DATA = dev/00-gammalib-activate.sh condadeactivatedir = $(sysconfdir)/conda/deactivate.d -condadeactivate_DATA = dev/gammalib-deactivate.sh +condadeactivate_DATA = dev/01-gammalib-deactivate.sh # Manual pages to install man_MANS = @@ -59,7 +59,7 @@ docdir = ${datadir}/doc/${PACKAGE} EXTRA_DIST = README.md \ doc/Doxyfile doc/source \ dev/testreport.py \ - dev/gammalib-activate.sh dev/gammalib-deactivate.sh \ + dev/00-gammalib-activate.sh dev/01-gammalib-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-gammalib-activate.sh b/dev/00-gammalib-activate.sh new file mode 100644 index 0000000..68986a5 --- /dev/null +++ b/dev/00-gammalib-activate.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +export GAMMALIB=${CONDA_PREFIX} +source ${GAMMALIB}/bin/gammalib-init.sh diff --git a/dev/01-gammalib-deactivate.sh b/dev/01-gammalib-deactivate.sh new file mode 100644 index 0000000..4b87f80 --- /dev/null +++ b/dev/01-gammalib-deactivate.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +unset GAMMALIB diff --git a/dev/gammalib-activate.sh b/dev/gammalib-activate.sh deleted file mode 100644 index 68986a5..0000000 --- a/dev/gammalib-activate.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -export GAMMALIB=${CONDA_PREFIX} -source ${GAMMALIB}/bin/gammalib-init.sh diff --git a/dev/gammalib-deactivate.sh b/dev/gammalib-deactivate.sh deleted file mode 100644 index 4b87f80..0000000 --- a/dev/gammalib-deactivate.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -unset GAMMALIB -- libgit2 0.21.4