summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Functions/Newuser/zsh-newuser-install7
2 files changed, 7 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 9459a3a64..d8132c730 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
2010-06-30 Clint Adams <clint@zsh.org>
- * 27998: Functions/Newuser/zsh-newuser-install: add recommended
- zshrc option.
+ * 27998, 28061: Functions/Newuser/zsh-newuser-install: add
+ recommended zshrc option.
* 28060: Completion/Unix/Command/_xmlsoft: xmlsoft --nodtdattr
completion thanks to Vincent Lefevre.
@@ -13343,5 +13343,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5017 $
+* $Revision: 1.5018 $
*****************************************************
diff --git a/Functions/Newuser/zsh-newuser-install b/Functions/Newuser/zsh-newuser-install
index 97b33cfc5..3c97d80cd 100644
--- a/Functions/Newuser/zsh-newuser-install
+++ b/Functions/Newuser/zsh-newuser-install
@@ -954,10 +954,11 @@ You can:
print -r "
(1) Continue to the main menu.
"
- if [[ -f /etc/zsh/recommended.zshrc ]]; then
+ if [[ -f /etc/zsh/zshrc.recommended ]]; then
print -r "
(2) Populate your $zdmsg/.zshrc with the configuration recommended
- by the system administrator."
+ by the system administrator and exit (you will need to edit
+ the file by hand, if so desired)."
fi
read -k key$longprompt
@@ -977,7 +978,7 @@ You can:
;;
(2)
- cp /etc/zsh/recommended.zshrc $zd/.zshrc
+ cp /etc/zsh/zshrc.recommended $zd/.zshrc
source $zd/.zshrc
return 0
;;