Re: PATCH: Re: Implementation of simple newuser module (how to start?)

[Peter Stephenson <pws@csr.com>]

Peter Stephenson wrote:
> Bart Schaefer wrote:
> > } +autoload -U zsh-install-newuser
> > } +zsh-install-newuser
> > 
> > I suggest that instead this be:
> > 
> >  autoload -U +X zsh-install-newuser && zsh-install-newuser
> > 
> > That is, don't execute the function if it can't be autoloaded, and don't
> > redefine it if it is already defined.
> 
> But autoload +X returns false if the function was already defined, so it
> wouldn't execute the function in that case.

The following takes account of that.

> I have belatedly realised that zsh-newuser-install would probably be a
> better name, since if the function gets split up into smaller functions
> it gives a namespace.

I'll change this at the same time.

I've made the function a bit safer, so that if it gets run automatically
it doesn't trash .zshrc.  In future it may well be smart enough to be
able to update existing files, in which case the test won't be
appropriate.

Index: Functions/Newuser/.distfiles
===================================================================
RCS file: /cvsroot/zsh/zsh/Functions/Newuser/.distfiles,v
retrieving revision 1.1
diff -u -r1.1 .distfiles
--- Functions/Newuser/.distfiles	21 Jul 2005 13:45:27 -0000	1.1
+++ Functions/Newuser/.distfiles	26 Jul 2005 10:18:55 -0000
@@ -1,4 +1,4 @@
 DISTFILES_SRC='
 .distfiles
-zsh-install-newuser
+zsh-newuser-install
 '
Index: Functions/Newuser/zsh-install-newuser
===================================================================
RCS file: Functions/Newuser/zsh-install-newuser
diff -N Functions/Newuser/zsh-install-newuser
--- Functions/Newuser/zsh-install-newuser	20 Jul 2005 18:08:53 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-# Function to install startup files for a new user.
-# This dummy version simply creates a new .zshrc with a comment.
-# FIXME: we don't want to distribute a file that does that, it
-# would be preferable to do nothing at all.
-
-# Sanitize environment.
-emulate -L zsh
-
-echo "# Created by newuser for $ZSH_VERSION" >${ZDOTDIR:-$HOME}/.zshrc
-
-unfunction zsh-install-newuser
Index: Functions/Newuser/zsh-newuser-install
===================================================================
RCS file: Functions/Newuser/zsh-newuser-install
diff -N Functions/Newuser/zsh-newuser-install
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Functions/Newuser/zsh-newuser-install	26 Jul 2005 10:18:55 -0000
@@ -0,0 +1,23 @@
+# Function to install startup files for a new user.
+# This dummy version simply creates a new .zshrc with a comment.
+# FIXME: we don't want to distribute a file that does that, it
+# would be preferable to do nothing at all.
+
+# Sanitize environment.
+emulate -L zsh
+
+local zd=${ZDOTDIR:-$HOME}
+
+# The zsh/newuser module already tests for the following, so this test only
+# triggers if zsh-newuser-install is run by hand.
+#
+# In future we may want to use this mechanism to update startup files.
+if [[ -e $zd/.zshenv || -e $zd/.zprofile || -e $zd/.zshrc || -e $zs/.zlogin ]]
+then
+  print "zsh-newuser-install:  startup files exist, aborting" >&2
+  return 1
+fi
+
+echo "# Created by newuser for $ZSH_VERSION" >$zd/.zshrc
+
+unfunction zsh-newuser-install
Index: Scripts/newuser
===================================================================
RCS file: /cvsroot/zsh/zsh/Scripts/newuser,v
retrieving revision 1.1
diff -u -r1.1 newuser
--- Scripts/newuser	20 Jul 2005 18:08:53 -0000	1.1
+++ Scripts/newuser	26 Jul 2005 10:18:55 -0000
@@ -2,5 +2,7 @@
 # no startup files.  See the documentation for the zsh/newuser
 # module in zshmodules(1).
 
-autoload -U zsh-install-newuser
-zsh-install-newuser
+if functions zsh-newuser-install >/dev/null 2>&1 ||
+   autoload -U +X zsh-newuser-install; then
+   zsh-newuser-install
+fi

-- 
Peter Stephenson <pws@csr.com>                  Software Engineer
CSR PLC, Churchill House, Cambridge Business Park, Cowley Road
Cambridge, CB4 0WZ, UK                          Tel: +44 (0)1223 692070


**********************************************************************
This email and any files transmitted with it are confidential and
intended solely for the use of the individual or entity to whom they
are addressed. If you have received this email in error please notify
the system manager.

**********************************************************************