Ticket #13459: 13459_no_cd_scripts.patch

ipy_profile_sage.py

@@ -8 +8 @@
     sage.all_cmdline._init_cmdline(globals())
     
     _ip.ex('from sage.all import Integer, RealNumber')
-    os.chdir(os.environ["CUR"])
     import sage.misc.interpreter
     
     from sage.misc.interpreter import attached_files 

sage-build

@@ -24 +24 @@
       # install
       echo ""
       echo "Installing c_lib"
-      CUR=`pwd`
-      cd "c_lib"
+      cd c_lib
       scons -Q install
       # make sure c_lib install went okay
       if [ $? -ne 0 ]; then
           echo >&2 "Error building c_lib."
           exit 1
       fi
-      cd "$CUR"
 
+      cd "$SAGE_ROOT/devel/$1/"
       ./install "$SAGE_ROOT"
       if [ $? -ne 0 ]; then
          echo >&2 "Error installing modified $1 library code."
@@ -73 +72 @@
 fi
 
 if [ $DO_BUILD_ALL = 1 ]; then
-    CUR=`pwd`
     cd "$SAGE_ROOT/devel/sage/sage"
     echo "*** TOUCHING ALL CYTHON (.pyx) FILES ***"
     touch */*.pyx */*/*.pyx */*/*/*.pyx */*/*/*/*.pyx */*/*/*/*/*.pyx */*/*/*/*/*.pyx  */*/*/*/*/*/*.pyx 2> /dev/null
     cd ../c_lib
     scons -Q install
-    cd "$CUR"
 fi
 
 build "sage"

sage-eval

@@ -7 +7 @@
 
 if len(sys.argv) > 1:
     s = preparse(" ".join(sys.argv[1:]))
-    os.chdir(os.getenv("CUR"))
     if s.startswith('load') or s.startswith('attach'):
-        curdir = os.getenv("CUR")
-        os.system('sage "' + os.path.join(curdir, s.split(None, 1)[1]) + '"')
+        os.system('sage "' + os.path.join(os.getcwd(), s.split(None, 1)[1]) + '"')
     else:
         eval(compile(s,'<cmdline>','exec'))
 

sage-ipython

@@ -1 +1 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 """
-SAGE IPython startup script.
-
+Sage IPython startup script.
 """
 
 import os
 import sys
 
-#Make sure we're using the Sage profile
-#is one isn't specified
+# Make sure we're using the Sage profile if one isn't specified.
 if '-p' not in sys.argv:
     sys.argv.extend(['-p', 'sage'])
 
+
+# Import the Sage module before starting IPython, to ensure we import
+# Sage from the correct directory (in site-packages).
+#
+# IPython adds the current working directory to sys.path.  If the
+# current working directory is $SAGE_ROOT/devel/sage, sage would be
+# imported from $SAGE_ROOT/devel/sage/sage, which is bad for example
+# because it does not contain the Cython modules.  Importing sage before
+# IPython changes sys.path avoids these problems.
+import sage
+
+
 __SAGE_AUTOINJECT__ = True
 
 import IPython
@@ -23 +33 @@
 sageCH = CrashHandler(ipy_sage.IP, 'Sage', 'sage-support',
                       'sage-support@googlegroups.com',
                       'http://trac.sagemath.org/sage_trac',
-                      'Sage_crash_report.txt',
+                      'Sage_crash_report.txt',
                       show_crash_traceback=False)
 
 ipy_sage.IP.set_crash_handler(sageCH)

sage-preparse

@@ -11 +11 @@
 
 import os, sys, re
 
-# The spkg/bin/sage script that calls sage-preparse passes the current
-# directory in as the first argument.
-os.chdir(sys.argv[1])
-
-# It passes the files to be preparsed in as all other arguments.
-files = sys.argv[2:]
+# The spkg/bin/sage script passes the files to be preparsed as
+# arguments (but remove sys.argv[0]).
+files = sys.argv[1:]
 
 # There must be at least 1 file or we display an error/usage message
 # and exit

sage-run

@@ -3 +3 @@
 import os, sys
 from subprocess import call
 
-os.chdir(sys.argv[1])
-
-if len(sys.argv) < 3:
+if len(sys.argv) < 2:
     print "You must give a file argument"
     sys.exit(1)
 
-fn = sys.argv[2]
-opts = sys.argv[3:]
+fn = sys.argv[1]
+opts = sys.argv[2:]
 
 if fn.startswith('-'):
     print "sage-run received unknown option: %s " % fn

deleted file sage-run2

@@ -1 @@
-#!/usr/bin/env python
-
-import os, sys
-
-args=sys.argv[1:]
-
-files = [x for x in args if len(x) > 0 and x[0] != '-']
-
-if len(files) == 0:
-    sys.exit(1)
-
-opts  = ' '.join([x for x in args if len(x) > 0 and x[0] == '-'])
-if os.system('sage-preparse %s'%(' '.join(files))):
-    sys.exit(1)
-
-for file in files:
-    if file[-5:] == '.sage':
-        e = os.system('sage-python %s %s.py'%(opts, file))
-    else:
-        e = os.system('sage-python %s %s'%(opts, file))
-    if e:
-        print "sage: Error running %s using Python"%file
-
-
-
-

sage-sdist

@@ -39 +39 @@
 
 TARGET="sage-$SAGE_VERSION"
 
-CUR=`pwd`
-
 SAGE_RELEASE_DATE=`date -u +'%Y-%m-%d'`
 
 # Update Sage version file in SAGE_ROOT.
@@ -59 +57 @@
 cd "$SAGE_ROOT"/local/bin/
 echo "import sage.misc.banner; sage.misc.banner.banner()" | ./python > sage-banner
 
-cd "$CUR"
-
 # Copy sage root directory.  Cloning needs to be done in an empty
 # directory, so we do this now.  Creating the sage_root spkg is done
 # in sage-make_devel_packages below.