[arch-releng] [PATCH 1/2] Make helptext variables local

pyther at pyther.net pyther at pyther.net
Wed Feb 9 16:47:35 EST 2011


---
 src/core/libs/lib-ui-interactive.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh
index 45d3282..6ec6a06 100644
--- a/src/core/libs/lib-ui-interactive.sh
+++ b/src/core/libs/lib-ui-interactive.sh
@@ -57,6 +57,7 @@ interactive_configure_system()
 	fi
 
 	local default=no
+	local helptext
 	while true; do
 		helptext="\nNote that if you want to change any file not listed here (unlikely) you can go to another tty and update ${var_TARGET_DIR}/etc/<filename> yourself"
 		grep -q '^/dev/mapper' $TMP_FSTAB && helptext="$helptext\n/dev/mapper/ users: Pay attention to HOOKS in mkinitcpio.conf"
@@ -1075,7 +1076,7 @@ EOF
 
 interactive_grub_menulst () {
 	generate_grub_menulst
-	helptext=
+	local helptext=
 	grep -q '^/dev/mapper' $TMP_FSTAB && helptext="  /dev/mapper/ users: Pay attention to the kernel line!"
 	notify "Before installing GRUB, you must review the configuration file.  You will now be put into the editor.  After you save your changes and exit the editor, you can install GRUB.$helptext"
 	seteditor || return 1
-- 
1.7.4



More information about the arch-releng mailing list