From 0f743702bb9e952f1b74fd2d49a5b802ecb0ecab Mon Sep 17 00:00:00 2001 From: Felix Salfelder Date: Wed, 19 Jun 2013 15:49:24 +0200 Subject: [PATCH 1/2] python-sage provide SAGE_ETC (#14750) --- src/bin/sage-env | 1 + src/sage/interfaces/gp.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/bin/sage-env b/src/bin/sage-env index 5e5af1b3742..60974449e2c 100644 --- a/src/bin/sage-env +++ b/src/bin/sage-env @@ -245,6 +245,7 @@ fi # Setting Sage-related location environment variables. export SAGE_LOCAL="$SAGE_ROOT/local" +export SAGE_ETC="$SAGE_LOCAL/etc" export SAGE_SHARE="$SAGE_LOCAL/share" export SAGE_EXTCODE="$SAGE_SHARE/sage/ext" export SAGE_SPKG_INST="$SAGE_LOCAL/var/lib/sage/installed" diff --git a/src/sage/interfaces/gp.py b/src/sage/interfaces/gp.py index a44a02eb52c..91531ce8212 100644 --- a/src/sage/interfaces/gp.py +++ b/src/sage/interfaces/gp.py @@ -977,11 +977,11 @@ def is_GpElement(x): """ return isinstance(x, GpElement) -from sage.env import DOT_SAGE, SAGE_LOCAL +from sage.env import DOT_SAGE, SAGE_ETC import os -# Set GPRC environment variable to $SAGE_LOCAL/etc/gprc.expect -os.environ["GPRC"] = os.path.join(SAGE_LOCAL, 'etc', 'gprc.expect') +# Set GPRC environment variable to $SAGE_ETC/gprc.expect +os.environ["GPRC"] = os.path.join(SAGE_ETC, 'gprc.expect') # An instance gp = Gp(logfile=os.path.join(DOT_SAGE,'gp-expect.log')) # useful for debugging! From 573b23ec346f9b6dbcd60f4168f4f6ea59965d84 Mon Sep 17 00:00:00 2001 From: Felix Salfelder Date: Tue, 27 Aug 2013 11:42:15 +0200 Subject: [PATCH 2/2] also provide sage.env.SAGE_ETC --- src/sage/env.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/sage/env.py b/src/sage/env.py index 082ea574d19..6eb97e2bed2 100644 --- a/src/sage/env.py +++ b/src/sage/env.py @@ -87,6 +87,7 @@ def _add_variable_or_fallback(key, fallback, force=False): # bunch of sage directories and files _add_variable_or_fallback('SAGE_ROOT', None) _add_variable_or_fallback('SAGE_LOCAL', opj('$SAGE_ROOT', 'local')) +_add_variable_or_fallback('SAGE_ETC', opj('$SAGE_LOCAL', 'etc')) _add_variable_or_fallback('SAGE_SHARE', opj('$SAGE_LOCAL', 'share')) # SAGE_LIB is the site-packages directory if the sage library