On Wed, Jun 07, 2006 at 06:00:07PM -0500, Will Maier wrote:
> The diff pasted below should take care of it. Silly me...
Sorry to keep replying to myself; the patch should also remove the
'-o %l'.
Long day...
--
o--------------------------{ Will Maier }--------------------------o
| jabber:[EMAIL PROTECTED] | [EMAIL PROTECTED] |
| freenode:..............lt_kije | freenode:........#madlug,#wilug |
*------------------[ BSD Unix: Live Free or Die ]------------------*
--- ../ipython-old/patches/patch-IPython_iplib_py Wed Jun 7 11:14:28 2006
+++ patches/patch-IPython_iplib_py Wed Jun 7 17:50:00 2006
@@ -1,24 +1,21 @@
-$OpenBSD: patch-IPython_iplib_py,v 1.1.1.1 2006/05/28 21:59:20 steven Exp $
---- IPython/iplib.py.orig Mon Jan 30 07:34:22 2006
-+++ IPython/iplib.py Sun May 28 15:49:04 2006
-@@ -576,15 +576,15 @@ class InteractiveShell(object,Magic):
- # long ls
- 'll ls -lF',
- # color ls
-- 'lc ls -F -o --color',
-+ #'lc ls -F -o --color',
- # ls normal files only
-- 'lf ls -F -o --color %l | grep ^-',
-+ 'lf ls -F -l %l | grep ^-',
- # ls symbolic links
-- 'lk ls -F -o --color %l | grep ^l',
-+ 'lk ls -F -l %l | grep ^l',
- # directories or links to directories,
-- 'ldir ls -F -o --color %l | grep /$',
-+ 'ldir ls -F -l %l | grep /$',
- # things which are executable
-- 'lx ls -F -o --color %l | grep ^-..x',
-+ 'lx ls -F -l %l | grep *$',
- )
+$OpenBSD$
+--- IPython/iplib.py.orig Wed Jun 7 17:48:10 2006
++++ IPython/iplib.py Wed Jun 7 17:49:40 2006
+@@ -566,13 +566,13 @@ class InteractiveShell(object,Magic):
+ # --color switch out of the box
+ if 'bsd' in sys.platform:
+ ls_extra = ( # ls normal files only
+- 'lf ls -F -o %l | grep ^-',
++ 'lf ls -lF | grep ^-',
+ # ls symbolic links
+- 'lk ls -F -o %l | grep ^l',
++ 'lk ls -lF | grep ^l',
+ # directories or links to directories,
+- 'ldir ls -F -o %l | grep /$',
++ 'ldir ls -lF | grep /$',
+ # things which are executable
+- 'lx ls -F -o %l | grep ^-..x',
++ 'lx ls -lF | grep ^-..x',
+ )
+ auto_alias = auto_alias + ls_extra
elif os.name in ['nt','dos']:
- auto_alias = ('dir dir /on', 'ls dir /on',
