Functions moved

Functions moved

[Sven Wischnowsky]

Ok, done.

Comments:

- Everything worked fine, except: the files in Functions/Misc.  I had
  found out at home that the script effectively removed them, so I
  added some code to avoid that which worked there, but not here.  So
  I had to add those functions again.  I'm awfully sorry.
- Bart put `Functions/Misc/promptnl' in that list but I don't seem to
  have it (not even before my script removed all functions that stayed 
  in Misc).  Is my checked-out version wrong or what?
- As I said this morning, I've not added _vared (but _zed).  And of
  course I haven't changed _vars because of that.
- Configure-stuff: I hope to have got everything right so that one
  directory-level from the completion directories is removed on
  installation (all Zsh/*/* functions are installed under Zsh/).  We
  decided to do it this way, right?
  I didn't change the code under `*)' in uninstallfns.sh because I
  don't understand the sed-substitution used when FUNCTIONS_SUBDIRS is 
  true.  Isn't it the wrong way round?

I'd be thankful if everyone could now have a look (and try out) their
favourite features and functions.


Bye
 Sven


--
Sven Wischnowsky                         wischnow@informatik.hu-berlin.de

Re: Functions moved

[Oliver Kiddle]

Sven Wischnowsky <wischnow@informatik.hu-berlin.de> wrote: > 

> - As I said this morning, I've not added _vared (but _zed).  And of
>   course I haven't changed _vars because of that.

I'll commit _vared later

As you mentioned, _apm got left behind. I've never seen the apm
command. Is it Mandrake specific? It should probably be in
Linux/Command or somewhere.

> - Configure-stuff: I hope to have got everything right so that one
>   directory-level from the completion directories is removed on
>   installation (all Zsh/*/* functions are installed under Zsh/).  We

A few things aren't quite right. I did configure with
--enable-function-subdirs. I got some old directories (User, Bsd,
Builtins) - we should be able to remove them. compinit, compdump etc
got placed in their very own subdirectory and $fpath is wrong. Should I
not have used --enable-function-subdirs?

Oliver

____________________________________________________________
Do You Yahoo!?
Get your free @yahoo.co.uk address at http://mail.yahoo.co.uk
or your free @yahoo.ie address at http://mail.yahoo.ie

RE: Functions moved

[Andrej Borsenkow]

>
> As you mentioned, _apm got left behind. I've never seen the apm
> command. Is it Mandrake specific? It should probably be in
> Linux/Command or somewhere.
>

apm is frontend to apmd, power management daemon that handles bateries on
portables and can (with some luck) put your system to sleep. I guess, it
should be at least Linux-wide.

-andrej

Re: Functions moved

[Clint Adams]

> As you mentioned, _apm got left behind. I've never seen the apm
> command. Is it Mandrake specific? It should probably be in
> Linux/Command or somewhere.

It's not Mandrake-specific.  It's part of the apmd utilities
written by Rik Faith and now maintained by Avery Pennarun.
http://www.worldvisions.ca/~apenwarr/apmd/

Linux/Command sounds reasonable to me.

wrong fpath (RE: Functions moved)

[Andrej Borsenkow]

>
> - Everything worked fine, except: the files in Functions/Misc.

I did cvs up, make make install and got after starting new zsh:

bor@itsrm2% zsh
/home/bor/.zcompletion:16: compinit: function definition file not found
/home/bor/.zcompletion:41: command not found: compdef
bor@itsrm2% echo $fpath
/home/bor/.zsh.d/completion /home/bor/.zsh.d/functions
/tools/share/zsh/site-functions
/tools/share/zsh/4.0.1-pre-2/functions/Completion/AIX
/tools/share/zsh/4.0.1-pre-2/functions/Completion/Base
/tools/share/zsh/4.0.1-pre-2/functions/Completion/Bsd
/tools/share/zsh/4.0.1-pre-2/functions/Completion/Builtins
/tools/share/zsh/4.0.1-pre-2/functions/Completion/Commands
/tools/share/zsh/4.0.1-pre-2/functions/Completion/Core
/tools/share/zsh/4.0.1-pre-2/functions/Completion/Debian
/tools/share/zsh/4.0.1-pre-2/functions/Completion/Linux
/tools/share/zsh/4.0.1-pre-2/functions/Completion/User
/tools/share/zsh/4.0.1-pre-2/functions/Completion/X
/tools/share/zsh/4.0.1-pre-2/functions/Misc
/tools/share/zsh/4.0.1-pre-2/functions/Prompts
/tools/share/zsh/4.0.1-pre-2/functions/Zftp
/tools/share/zsh/4.0.1-pre-2/functions/Zle

Looks like default fpath was not changed in Makefiles? The init.c (at least)
was recompiled.

-andrej

Re: Functions moved

[Clint Adams]

> Linux/Command sounds reasonable to me.

I take that back.  This is going to cause the same sort of problems
that Bart wanted to avoid with the initscript conflict.

Non-linux operating systems have apm commands too.

RE: wrong fpath (RE: Functions moved)

[Andrej Borsenkow]

> Looks like default fpath was not changed in Makefiles? The init.c (at least)

zshpaths.h was not updated (and is not updated after I removed it) and I get:

bor@itsrm2% ls /tools/share/zsh/4.0.1-pre-2/functions
Completion  Misc        Prompts     Zftp        Zle
bor@itsrm2% ls /tools/share/zsh/4.0.1-pre-2/functions/Completion
_apm

zsh source tree looks reasonable to me:

bor@itsrm2% ls Completion               
AIX          CVS          Linux        Unix         compaudit    compinstall
BSD          Core         README       X            compdump
Base         Debian       Redhat       Zsh          compinit
bor@itsrm2% ls Completion/Base          
CVS        Completer  Core       Utility    Widget

etc

-andrej

Re: Functions moved

[Oliver Kiddle]

Oliver Kiddle <okiddle@yahoo.co.uk> wrote:

> got placed in their very own subdirectory and $fpath is wrong. Should
> I
> not have used --enable-function-subdirs?

I've just tried it without --enable-function-subdirs and everything
seems to work fine. The only problem I've found is that _dict_words is
missing so _dict fails.

Clint Adams wrote:

> I take that back.  This is going to cause the same sort of problems
> that Bart wanted to avoid with the initscript conflict.
> Non-linux operating systems have apm commands too.

The difference here is that we don't have apm completion for any other
non-linux operating systems whereas for the initscripts, we did.
Linux/Command is I think probably right place for the time being.

Oliver

____________________________________________________________
Do You Yahoo!?
Get your free @yahoo.co.uk address at http://mail.yahoo.co.uk
or your free @yahoo.ie address at http://mail.yahoo.ie

Re: Functions moved

[Bart Schaefer]

On Apr 2,  3:16pm, Sven Wischnowsky wrote:
} 
} - Everything worked fine, except: the files in Functions/Misc.  I had
}   found out at home that the script effectively removed them, so I
}   added some code to avoid that which worked there, but not here.  So
}   I had to add those functions again.  I'm awfully sorry.

Don't apologize!  The files were getting removed and added anyway.  I'm
sorry you had to do part of it by hand.

} - Bart put `Functions/Misc/promptnl' in that list but I don't seem to
}   have it (not even before my script removed all functions that stayed 
}   in Misc).  Is my checked-out version wrong or what?

No, it's sitting in my directory here at home because that's where I
edited it, but I never committed it because of the brief conversation
Zefram and I had about doing it in C code instead.  My turn to apologize.

I'll commit it after the installation kinks get unkinked.

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com

Zsh: http://www.zsh.org | PHPerl Project: http://phperl.sourceforge.net   

More problems - functions installed as dirs (RE: Functions moved)

[Andrej Borsenkow]

After cvs up and clean reconfigure in empty directory I got:

bor@itsrm2% pwd
/tools/share/zsh
bor@itsrm2% ll 4.0.1-pre-2/functions/Completion
total 16
drwxr-xr-x   2 root     other       1024 Apr  2 19:42 AIX/
drwxr-xr-x   2 root     other       1024 Apr  2 19:42 BSD/
drwxr-xr-x   2 root     other       2048 Apr  2 19:43 Base/
drwxr-xr-x   2 root     other         96 Apr  2 19:43 Core/
drwxr-xr-x   2 root     other       1024 Apr  2 19:43 Debian/
drwxr-xr-x   2 root     other         96 Apr  2 19:43 Linux/
drwxr-xr-x   2 root     other       1024 Apr  2 19:43 Redhat/
drwxr-xr-x   2 root     other       2048 Apr  2 19:44 Unix/
drwxr-xr-x   2 root     other         96 Apr  2 19:42 compaudit/
drwxr-xr-x   2 root     other         96 Apr  2 19:42 compdump/
drwxr-xr-x   2 root     other         96 Apr  2 19:42 compinit/
drwxr-xr-x   2 root     other         96 Apr  2 19:42 compinstall/

quoting install log:

gmake[1]: Leaving directory `/u3/u1/build/zsh/Src'
if test x/tools/share/zsh/4.0.1-pre-2/functions != x && test
x/tools/share/zsh/4.0.1-pre-2/functions != xno; then \
  test x/tools/share/zsh/site-functions != xno && \
    /tools/src/zsh/mkinstalldirs /tools/share/zsh/site-functions; \
  sdir_top="/tools/src/zsh" fndir="/tools/share/zsh/4.0.1-pre-2/functions"
dir_top="." \
  FUNCTIONS_SUBDIRS="yes" \
  INSTALL_DATA="/tools/src/zsh/install-sh -c -m 644" \
  DESTDIR="" VERSION="4.0.1-pre-2" \
  /bin/sh /tools/src/zsh/Config/installfns.sh || exit 1; \
fi; \
exit 0
mkdir /tools/share/zsh/4.0.1-pre-2
mkdir /tools/share/zsh/4.0.1-pre-2/functions
mkdir /tools/share/zsh/4.0.1-pre-2/functions/Misc
mkdir /tools/share/zsh/4.0.1-pre-2/functions/Prompts
mkdir /tools/share/zsh/4.0.1-pre-2/functions/Zftp
mkdir /tools/share/zsh/4.0.1-pre-2/functions/Completion
mkdir /tools/share/zsh/4.0.1-pre-2/functions/Completion/compaudit
mkdir /tools/share/zsh/4.0.1-pre-2/functions/Completion/compdump
mkdir /tools/share/zsh/4.0.1-pre-2/functions/Completion/compinit
mkdir /tools/share/zsh/4.0.1-pre-2/functions/Completion/compinstall
mkdir /tools/share/zsh/4.0.1-pre-2/functions/Completion/AIX
mkdir /tools/share/zsh/4.0.1-pre-2/functions/Completion/BSD
mkdir /tools/share/zsh/4.0.1-pre-2/functions/Completion/Base
mkdir /tools/share/zsh/4.0.1-pre-2/functions/Completion/Core
mkdir /tools/share/zsh/4.0.1-pre-2/functions/Completion/Debian
mkdir /tools/share/zsh/4.0.1-pre-2/functions/Completion/Linux
mkdir /tools/share/zsh/4.0.1-pre-2/functions/Completion/Redhat
mkdir /tools/share/zsh/4.0.1-pre-2/functions/Completion/Unix
mkdir /tools/share/zsh/4.0.1-pre-2/functions/Completion/X
...

-andrej

RE: More problems - functions installed as dirs (RE: Functions moved)

[Andrej Borsenkow]

>
> After cvs up and clean reconfigure in empty directory I got:
>
> bor@itsrm2% pwd
> /tools/share/zsh
> bor@itsrm2% ll 4.0.1-pre-2/functions/Completion
> total 16
> drwxr-xr-x   2 root     other       1024 Apr  2 19:42 AIX/
> drwxr-xr-x   2 root     other       1024 Apr  2 19:42 BSD/
> drwxr-xr-x   2 root     other       2048 Apr  2 19:43 Base/
> drwxr-xr-x   2 root     other         96 Apr  2 19:43 Core/
> drwxr-xr-x   2 root     other       1024 Apr  2 19:43 Debian/
> drwxr-xr-x   2 root     other         96 Apr  2 19:43 Linux/
> drwxr-xr-x   2 root     other       1024 Apr  2 19:43 Redhat/
> drwxr-xr-x   2 root     other       2048 Apr  2 19:44 Unix/
> drwxr-xr-x   2 root     other         96 Apr  2 19:42 compaudit/
> drwxr-xr-x   2 root     other         96 Apr  2 19:42 compdump/
> drwxr-xr-x   2 root     other         96 Apr  2 19:42 compinit/
> drwxr-xr-x   2 root     other         96 Apr  2 19:42 compinstall/

O.K., actually they are directories that have the smae functions inside, i.e.

bor@itsrm2% l 4.0.1-pre-2/functions/Completion/{compaudit,compdump,compinit}
4.0.1-pre-2/functions/Completion/compaudit:
compaudit

4.0.1-pre-2/functions/Completion/compdump:
compdump

4.0.1-pre-2/functions/Completion/compinit:
compinit

BUT

bor@itsrm2% zsh
compinit:1: permission denied:
/home/bor/.zcompletion:41: command not found: compdef
bor@itsrm2% echo $fpath
/home/bor/.zsh.d/completion /home/bor/.zsh.d/functions
/tools/share/zsh/site-functions
/tools/share/zsh/4.0.1-pre-2/functions/Completion
/tools/share/zsh/4.0.1-pre-2/functions/Completion/*/*
/tools/share/zsh/4.0.1-pre-2/functions/Misc
/tools/share/zsh/4.0.1-pre-2/functions/Prompts
/tools/share/zsh/4.0.1-pre-2/functions/Zftp
/tools/share/zsh/4.0.1-pre-2/functions/Zle

-andrej

Re: More problems - functions installed as dirs (RE: Functions moved)

[Bart Schaefer]

On Apr 2,  7:45pm, Andrej Borsenkow wrote:
} Subject: More problems - functions installed as dirs (RE: Functions moved)
}
} After cvs up and clean reconfigure in empty directory I got:
} 
} drwxr-xr-x   2 root     other         96 Apr  2 19:42 compaudit/
} drwxr-xr-x   2 root     other         96 Apr  2 19:42 compdump/
} drwxr-xr-x   2 root     other         96 Apr  2 19:42 compinit/
} drwxr-xr-x   2 root     other         96 Apr  2 19:42 compinstall/

% cvs -d barts@cvs.zsh.sourceforge.net:/cvsroot/zsh co -P -d new zsh
% cd new
% ./configure --enable-function-subdirs --prefix=/tmp/zshnew
% make
% make install
% ls -l /tmp/zshnew/share/zsh/4.0.1-pre-2/functions/Completion 
total 93
drwxr-xr-x   2 schaefer schaefer     1024 Apr  2 09:22 AIX/
drwxr-xr-x   2 schaefer schaefer     1024 Apr  2 09:22 BSD/
drwxr-xr-x   2 schaefer schaefer     2048 Apr  2 09:22 Base/
drwxr-xr-x   2 schaefer schaefer     1024 Apr  2 09:22 Debian/
drwxr-xr-x   2 schaefer schaefer     1024 Apr  2 09:22 Linux/
drwxr-xr-x   2 schaefer schaefer     1024 Apr  2 09:22 Redhat/
drwxr-xr-x   2 schaefer schaefer     2048 Apr  2 09:22 Unix/
drwxr-xr-x   2 schaefer schaefer     1024 Apr  2 09:22 X/
drwxr-xr-x   2 schaefer schaefer     2048 Apr  2 09:22 Zsh/
-rw-r--r--   1 schaefer schaefer     4587 Apr  2 09:22 compaudit
-rw-r--r--   1 schaefer schaefer     3952 Apr  2 09:22 compdump
-rw-r--r--   1 schaefer schaefer    14511 Apr  2 09:22 compinit
-rw-r--r--   1 schaefer schaefer    55681 Apr  2 09:22 compinstall

The only problem is:

%ls -l /tmp/zshnew/share/zsh/4.0.1-pre-2/functions/Completion/Linux
total 3
-rw-r--r--   1 schaefer schaefer       82 Apr  2 09:22 Entries
-rw-r--r--   1 schaefer schaefer       34 Apr  2 09:22 Repository
-rw-r--r--   1 schaefer schaefer       43 Apr  2 09:22 Root

It missed _apm entirely (because it's not in a sub-subdirectory, I guess)
and every one of the other directories got the files from its CVS subdir
installed.  That didn't happen before ...

Index: Config/installfns.sh
===================================================================
RCS file: /cvsroot/zsh/zsh/Config/installfns.sh,v
retrieving revision 1.6
diff -u -r1.6 installfns.sh
--- Config/installfns.sh	2001/04/02 14:36:38	1.6
+++ Config/installfns.sh	2001/04/02 16:43:04
@@ -15,6 +15,7 @@
   if test -f $sdir_top/$file; then
     if test x$FUNCTIONS_SUBDIRS != x -a x$FUNCTIONS_SUBDIRS != xno; then
       case "$file" in
+      */CVS/*) continue;;
       Completion/comp*)
         subdir="`echo $file | sed -e 's%/[^/]*/[^/]*$%%'`"
         instdir="$fndir/Completion"

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com

Zsh: http://www.zsh.org | PHPerl Project: http://phperl.sourceforge.net   

RE: More problems - functions installed as dirs (RE: Functions moved)

[Andrej Borsenkow]

>
> % cvs -d barts@cvs.zsh.sourceforge.net:/cvsroot/zsh co -P -d new zsh

Ditto here. Sigh, there are still way too many missing dependencies in our
makefiles. Sorry for the noice, but it hopefully may serve as warning to
others.

-andrej

Re: Functions moved

[Chmouel Boudjnah]

Clint Adams <schizo@debian.org> writes:

> > Hrm.  Any idea how they look like?  Option-wise?
> 
> Yup.  Here's Solaris 8.  It apparently has nothing to do with power
> management, but rather something related to sadmind.  I think.

[...]

> 
> And this is for FreeBSD 4.1:

isn't that possible to have the configure script to detect the system
and let install the FBSD or Linux (or whatever) version ?

>  #compdef apm
> +
> +# this needs intelligence
> +local kludge=linux

-- 
MandrakeSoft Inc                     http://www.chmouel.org
                      --Chmouel

Re: Functions moved

[Clint Adams]

> isn't that possible to have the configure script to detect the system
> and let install the FBSD or Linux (or whatever) version ?

It's possible, but I think that this would cause problems if someone
wants to share the file over different architectures.

I'll commit this for OpenBSD in the midst of moving it to Unix/Command:

_arguments -C \
     '-z[engage suspend mode]' \
     '-S[engage stand-by mode]' \
     '-l[display estimated battery lifetime percentage]' \
     '-m[display estimated battery lifetime minutes]' \
     '-b[display battery status]' \
     '-a[display AC line status]' \
     '-v[verbose]' \
     '-f[socket]:sockname:_files'

fi

Re: Functions moved

[Clint Adams]

> Hrm.  Any idea how they look like?  Option-wise?

Yup.  Here's Solaris 8.  It apparently has nothing to do with power
management, but rather something related to sadmind.  I think.

Usage:  apm  -c class [version]  -m method  [-h host]  [-d domain]
             [-t AuthType]  [-f AuthFlavor]  [-g ClientGroup]  [-n | -p]
             [-x AckSecs AckUsecs]  [-y RepSecs RepUsecs]
             [-k PingCnt]  [-w PingSecs PingUsecs]  [-i DelaySecs DelayUsecs]
             [-r ServerProg ServerVers]  [-u [file]]  [-l]
             [-D DebugCategories]  [-a name[=value] name[=value] ...]

And this is for FreeBSD 4.1:

Index: Completion/Linux/_apm
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Linux/_apm,v
retrieving revision 1.1
diff -u -r1.1 _apm
--- Completion/Linux/_apm	2001/04/01 01:12:07	1.1
+++ Completion/Linux/_apm	2001/04/02 15:19:25
@@ -1,4 +1,11 @@
 #compdef apm
+
+# this needs intelligence
+local kludge=linux
+
+if [[ $kludge == "linux" ]]
+then
+
 _arguments -C -s \
     '(--version)-V[print the apm program and exit immediately]' \
     '(-V)--version[print the apm program and exit immediately]' \
@@ -15,3 +22,19 @@
     '(--ignore)-i[tell the system to ignore system-generated APM message]' \
     '(-i)--ignore[tell the system to ignore system-generated APM message]'
 
+else
+     
+_arguments -C \
+     '-a[display AC line status]' \
+     '-b[display battery status]' \
+     '-d[disable/enable display suspension]:bool:' \
+     '-e[disable/enable apm functions]:bool:' \
+     '-h[disable/enable HLT in kernel context switch]:bool:' \
+     '-l[display remaining battery percentage]' \
+     '-r[enable resume wakeup timer]' \
+     '-s[display status of APM support]' \
+     '-t[display estimated remaining battery life in seconds]' \
+     '-Z[transition system into standby mode]' \
+     '-z[suspend the system]'
+
+fi

Re: Functions moved

[Sven Wischnowsky]

Clint Adams wrote:

> > Linux/Command sounds reasonable to me.
> 
> I take that back.  This is going to cause the same sort of problems
> that Bart wanted to avoid with the initscript conflict.
> 
> Non-linux operating systems have apm commands too.

Hrm.  Any idea how they look like?  Option-wise?

Otherwise I agree with Oliver that we should just add a Linux/Command
directory and put it there for now.


Anyway.  I'm sorry, but I have to go now, more tomorrow (no doubt
about that I'd guess).

Bye
 Sven


--
Sven Wischnowsky                         wischnow@informatik.hu-berlin.de

Re: Functions moved

[Sven Wischnowsky]

I wrote:

> Ok, done.

No.  Chmouel smuggled in a new _apm into the Linux directory.  Under
the new regime, where should we place it?  Debian?  Unix?  (Currently
there is no Linux directory anymore -- or wouldn't if there weren't
that _apm file in it.  Should we keep it alive and add a Command
sub-directory to it?)

Obviously apm doesn't tell me anything...

Bye
 Sven


--
Sven Wischnowsky                         wischnow@informatik.hu-berlin.de