summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Functions/Newuser/zsh-newuser-install11
2 files changed, 17 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4f4017e51..0068ca37e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-30  Clint Adams  <clint@zsh.org>
+
+	* 27998: Functions/Newuser/zsh-newuser-install: add recommended
+	zshrc option.
+
 2010-06-23  Doug Kearns  <dougkearns@gmail.com>
 
 	* 28056: Completion/Unix/Command/_lynx: add option descriptions.
@@ -13335,5 +13340,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5015 $
+* $Revision: 1.5016 $
 *****************************************************
diff --git a/Functions/Newuser/zsh-newuser-install b/Functions/Newuser/zsh-newuser-install
index 84d68a831..97b33cfc5 100644
--- a/Functions/Newuser/zsh-newuser-install
+++ b/Functions/Newuser/zsh-newuser-install
@@ -954,6 +954,11 @@ You can:
   print -r "
 (1)  Continue to the main menu.
 "
+  if [[ -f /etc/zsh/recommended.zshrc ]]; then
+    print -r "
+(2)  Populate your $zdmsg/.zshrc with the configuration recommended
+     by the system administrator."
+  fi
 
   read -k key$longprompt
   print
@@ -971,6 +976,12 @@ You can:
     (1)
     ;;
 
+    (2)
+    cp /etc/zsh/recommended.zshrc $zd/.zshrc
+    source $zd/.zshrc
+    return 0
+    ;;
+
     (*)
     print -r "Aborting."
     if [[ $1 != -f ]]; then