[gentoo-commits] emacs r1259 - eselect-emacs

[Ulrich Mueller (ulm)]

Author: ulm
Date: 2009-04-20 06:57:30 +0000 (Mon, 20 Apr 2009)
New Revision: 1259

Modified:
   eselect-emacs/ChangeLog
   eselect-emacs/ctags.eselect
   eselect-emacs/emacs.eselect
Log:
Remove unnecessary quotes and other small fixes.

Modified: eselect-emacs/ChangeLog
===================================================================
--- eselect-emacs/ChangeLog	2009-04-19 00:49:34 UTC (rev 1258)
+++ eselect-emacs/ChangeLog	2009-04-20 06:57:30 UTC (rev 1259)
@@ -1,3 +1,8 @@
[phone]  Ulrich Mueller  <ulm@g.o>
+
+	* ctags.eselect:
+	* emacs.eselect: Remove unnecessary quotes and other small fixes.
+
 2009-04-18  Ulrich Mueller  <ulm@g.o>
 
 	* ctags.eselect	(do_list): Always output a list header, even if

Modified: eselect-emacs/ctags.eselect
===================================================================
--- eselect-emacs/ctags.eselect	2009-04-19 00:49:34 UTC (rev 1258)
+++ eselect-emacs/ctags.eselect	2009-04-20 06:57:30 UTC (rev 1259)
@@ -39,12 +39,12 @@
 	# currently active Emacs version (selected by emacs.eselect)
 	# The logic here is the same as in emacs.eselect, don't change it!
 	local emacs
-	if [[ -L "${ROOT}${bindir}/emacs" && \
+	if [[ -L ${ROOT}${bindir}/emacs && \
 		  -e $(canonicalise "${ROOT}${bindir}/emacs") ]]; then
 		emacs=$(basename $(readlink "${ROOT}${bindir}/emacs") )
-		[[ -f "${ROOT}${bindir}/${CTAGS}-${emacs}" ]] && echo ${CTAGS}-${emacs}
-	elif [[ -f "${ROOT}${bindir}/xemacs" ]]; then
-		[[ -f "${ROOT}${bindir}/${CTAGS}-xemacs" ]] && echo ${CTAGS}-xemacs
+		[[ -f ${ROOT}${bindir}/${CTAGS}-${emacs} ]] && echo "${CTAGS}-${emacs}"
+	elif [[ -f ${ROOT}${bindir}/xemacs ]]; then
+		[[ -f ${ROOT}${bindir}/${CTAGS}-xemacs ]] && echo "${CTAGS}-xemacs"
 	elif [[ ${CTAGS} == etags ]]; then
 		# We are called as etags module, but no (X)Emacs is installed.
 		# Return an empty list in this case, because we don't want
@@ -54,7 +54,7 @@
 	fi
 
 	# Exuberant ctags
-	[[ -f "${ROOT}${bindir}/exuberant-ctags" ]] && echo exuberant-ctags
+	[[ -f ${ROOT}${bindir}/exuberant-ctags ]] && echo exuberant-ctags
 }
 
 remove_symlinks() {
@@ -85,7 +85,7 @@
 
 set_symlinks() {
 	# Set symlinks to binary and man page
-	local target="${1}" targets
+	local target=$1 targets
 	# target may be specified by its name or its index
 	if is_number "${target}"; then
 		# numeric index, find the target's name
@@ -96,8 +96,8 @@
 	fi
 
 	# is the target valid, i.e. does a ctags binary with this name exist?
-	[[ -f "${ROOT}${bindir}/${target}" ]] \
-		|| die -q "Target \"${1}\" doesn't appear to be valid!"
+	[[ -f ${ROOT}${bindir}/${target} ]] \
+		|| die -q "Target \"$1\" doesn't appear to be valid!"
 
 	echo "Switching ${CTAGS} to ${target} ..."
 	remove_symlinks || die -q "Couldn't remove existing symlink"
@@ -108,7 +108,7 @@
 
 test_for_root() {
 	# checks if the user has rights to modify /usr/bin/
-	[[ -w "${ROOT}${bindir}" ]] || die -q "You need root privileges!"
+	[[ -w ${ROOT}${bindir} ]] || die -q "You need root privileges!"
 }
 
 ### show action ###
@@ -118,14 +118,14 @@
 }
 
 do_show() {
-	[[ ${#@} -gt 0 ]] && die -q "Too many parameters"
+	[[ $# -gt 0 ]] && die -q "Too many parameters"
 
 	write_list_start "Current target of ${CTAGS} symlink:"
-	if [[ -L "${ROOT}${bindir}/${CTAGS}" && \
+	if [[ -L ${ROOT}${bindir}/${CTAGS} && \
 		  -e $(canonicalise "${ROOT}${bindir}/${CTAGS}") ]]; then
 		write_kv_list_entry \
 			$(basename $(readlink "${ROOT}${bindir}/${CTAGS}") ) ""
-	elif [[ -e "${ROOT}${bindir}/${CTAGS}" ]]; then
+	elif [[ -e ${ROOT}${bindir}/${CTAGS} ]]; then
 		write_kv_list_entry \
 			"(not a symlink or target of symlink does not exist)" ""
 	else
@@ -140,7 +140,7 @@
 }
 
 do_list() {
-	[[ ${#@} -gt 0 ]] && die -q "Too many parameters"
+	[[ $# -gt 0 ]] && die -q "Too many parameters"
 
 	local i targets
 	targets=( $(find_targets) )
@@ -174,16 +174,16 @@
 }
 
 do_set() {
-	[[ -z "${1}" ]] && die -q "You didn't tell me what to set the symlink to"
-	[[ ${#@} -gt 1 ]] && die -q "Too many parameters"
+	[[ -z $1 ]] && die -q "You didn't tell me what to set the symlink to"
+	[[ $# -gt 1 ]] && die -q "Too many parameters"
 	test_for_root
 
-	if [[ -e "${ROOT}${bindir}/${CTAGS}" && ! -L "${ROOT}${bindir}/${CTAGS}" ]]
+	if [[ -e ${ROOT}${bindir}/${CTAGS} && ! -L ${ROOT}${bindir}/${CTAGS} ]]
 	then
 		die -q "${ROOT}${bindir}/${CTAGS} exists but is not a symlink"
 	fi
 
-	set_symlinks "${1}" || die -q "Couldn't set a new symlink"
+	set_symlinks "$1" || die -q "Couldn't set a new symlink"
 }
 
 ### update action ###
@@ -193,18 +193,18 @@
 }
 
 do_update() {
-	[[ -z "${1}" || "${1}" == norecursion ]] || die -q "Usage error"
-	[[ ${#@} -gt 1 ]] && die -q "Too many parameters"
+	[[ -z $1 || $1 == norecursion ]] || die -q "Usage error"
+	[[ $# -gt 1 ]] && die -q "Too many parameters"
 	test_for_root
 
 	local current=""
-	if [[ -L "${ROOT}${bindir}/${CTAGS}" ]]; then
+	if [[ -L ${ROOT}${bindir}/${CTAGS} ]]; then
 		current=$(basename $(readlink "${ROOT}${bindir}/${CTAGS}") )
 		if [[ ! -e $(canonicalise "${ROOT}${bindir}/${CTAGS}") ]]; then
 			# clean up dead symlinks
 			remove_symlinks || die -q "Couldn't remove existing symlink"
 		fi
-	elif [[ -e "${ROOT}${bindir}/${CTAGS}" ]]; then
+	elif [[ -e ${ROOT}${bindir}/${CTAGS} ]]; then
 		if ! [[ ${CTAGS} == ctags && $(uname) == FreeBSD ]]; then
 			die -q "${ROOT}${bindir}/${CTAGS} exists but is not a symlink"
 		fi
@@ -219,15 +219,15 @@
 	local i target targets=( $(find_targets) )
 	if [[ ${#targets[@]} -gt 0 && ${current} != nolink ]]; then
 		target=${targets[0]}
-		[[ "${current}" == ${CTAGS}-*emacs* ]] && current="${CTAGS}-*emacs*"
+		[[ ${current} == ${CTAGS}-*emacs* ]] && current="${CTAGS}-*emacs*"
 		for i in ${targets[@]}; do
-			[[ "${i}" == "${current}" ]] && target="${i}"
+			[[ ${i} == "${current}" ]] && target=${i}
 		done
 		set_symlinks "${target}" || die -q "Couldn't set a new symlink"
 	fi
 
 	# Call "eselect etags update" from the ctags module and vice versa
-	[[ "${1}" == norecursion ]] && return
+	[[ $1 == norecursion ]] && return
 	case ${CTAGS} in
 		ctags) CTAGS=etags do_update norecursion ;;
 		etags) CTAGS=ctags do_update norecursion ;;

Modified: eselect-emacs/emacs.eselect
===================================================================
--- eselect-emacs/emacs.eselect	2009-04-19 00:49:34 UTC (rev 1258)
+++ eselect-emacs/emacs.eselect	2009-04-20 06:57:30 UTC (rev 1259)
@@ -49,8 +49,8 @@
 
 # Define INFOPATH environment variable in env file
 set_infopath() {
-	[[ -d "${ROOT}${infodir}/${1}" ]] || return 1
-	echo "INFOPATH=${infodir}/${1}" > "${ROOT}${envdir}/50emacs"
+	[[ -d ${ROOT}${infodir}/$1 ]] || return 1
+	echo "INFOPATH=${infodir}/$1" > "${ROOT}${envdir}/50emacs"
 }
 
 remove_symlinks() {
@@ -72,9 +72,9 @@
 	local target=${1} f
 	for f in ${BINARYLIST}; do
 		# set symlink only if target binary actually exists
-		if [[ -f "${ROOT}${bindir}/${f}-${target}" ]]; then
-			ln -s "${f}-${target}" "${ROOT}${bindir}/${f}" ||
-				die "Couldn't set ${f}-${target} ${ROOT}${bindir}/${f} symlink"
+		if [[ -f ${ROOT}${bindir}/${f}-${target} ]]; then
+			ln -s "${f}-${target}" "${ROOT}${bindir}/${f}" || die \
+				"Couldn't set ${f}-${target} ${ROOT}${bindir}/${f} symlink"
 		fi
 	done
 }
@@ -96,7 +96,7 @@
 
 set_symlinks() {
 	# Set symlinks to binaries and man pages, update info path
-	local target="${1}" nomain="${2}" targets
+	local target=$1 nomain=$2 targets
 	# target may be specified by its name or its index
 	if is_number "${target}"; then
 		# numeric index, find the target's name
@@ -107,7 +107,7 @@
 	fi
 
 	# is the target valid, i.e. does an Emacs binary with this name exist?
-	[[ -f "${ROOT}${bindir}/${target}" ]] \
+	[[ -f ${ROOT}${bindir}/${target} ]] \
 		|| die -q "Target \"${1}\" doesn't appear to be valid!"
 
 	echo "Switching emacs to ${target} ..."
@@ -132,7 +132,7 @@
 xemacs_info() {
 	# This is just informational to tell that XEmacs has been found,
 	# a wish from graaff
-	if [[ -e "${ROOT}${bindir}/xemacs" ]]; then
+	if [[ -e ${ROOT}${bindir}/xemacs ]]; then
 		echo
 		write_list_start "XEmacs is also installed"
 	fi
@@ -140,7 +140,7 @@
 
 vim_info() {
 	# Don't take this too serious
-	if [[ -e "${ROOT}${bindir}/vi" ]]; then
+	if [[ -e ${ROOT}${bindir}/vi ]]; then
 		echo
 		write_list_start "Vi found, your system is in real trouble now! ;)"
 	fi
@@ -148,7 +148,7 @@
 
 test_for_root() {
 	# checks if the user has rights to modify /usr/bin/
-	[[ -w "${ROOT}${bindir}" ]] || die -q "You need root privileges!"
+	[[ -w ${ROOT}${bindir} ]] || die -q "You need root privileges!"
 }
 
 ### show action ###
@@ -158,14 +158,14 @@
 }
 
 do_show() {
-	[[ ${#@} -gt 0 ]] && die -q "Too many parameters"
+	[[ $# -gt 0 ]] && die -q "Too many parameters"
 
 	write_list_start "Current target of Emacs symlink:"
-	if [[ -L "${ROOT}${bindir}/emacs" && \
+	if [[ -L ${ROOT}${bindir}/emacs && \
 		  -e $(canonicalise "${ROOT}${bindir}/emacs") ]]; then
 		write_kv_list_entry \
 			$(basename $(readlink "${ROOT}${bindir}/emacs") ) ""
-	elif [[ -e "${ROOT}${bindir}/emacs" ]]; then
+	elif [[ -e ${ROOT}${bindir}/emacs ]]; then
 		write_kv_list_entry \
 			"(not a symlink or target of symlink does not exist)" ""
 	else
@@ -182,7 +182,7 @@
 }
 
 do_list() {
-	[[ ${#@} -gt 0 ]] && die -q "Too many parameters"
+	[[ $# -gt 0 ]] && die -q "Too many parameters"
 
 	local i targets
 	targets=( $(find_targets) )
@@ -218,11 +218,11 @@
 }
 
 do_set() {
-	[[ -z "${1}" ]] && die -q "You didn't tell me what to set the symlink to"
-	[[ ${#@} -gt 1 ]] && die -q "Too many parameters"
+	[[ -z $1 ]] && die -q "You didn't tell me what to set the symlink to"
+	[[ $# -gt 1 ]] && die -q "Too many parameters"
 	test_for_root
 
-	if [[ -e "${ROOT}${bindir}/emacs" && ! -L "${ROOT}${bindir}/emacs" ]]; then
+	if [[ -e ${ROOT}${bindir}/emacs && ! -L ${ROOT}${bindir}/emacs ]]; then
 		die -q "${ROOT}${bindir}/emacs exists but is not a symlink"
 	fi
 
@@ -243,19 +243,17 @@
 }
 
 do_update() {
-	[[ -z "${1}" || "${1}" == "ifunset" || "${1}" == "--if-unset" ]] \
-		|| die -q "Usage error"
-	[[ ${#@} -gt 1 ]] && die -q "Too many parameters"
+	[[ -z $1 || $1 == ifunset || $1 == --if-unset ]] || die -q "Usage error"
+	[[ $# -gt 1 ]] && die -q "Too many parameters"
 	test_for_root
 
-	if [[ -L "${ROOT}${bindir}/emacs" ]]; then
-		[[ ${1} == *if*unset \
-			&& -e $(canonicalise "${ROOT}${bindir}/emacs") ]] \
+	if [[ -L ${ROOT}${bindir}/emacs ]]; then
+		[[ $1 == *if*unset && -e $(canonicalise "${ROOT}${bindir}/emacs") ]] \
 			&& return
 		# this is not redundant: "update" is called in pkg_postrm() of emacs
 		# and should clean up any dead symlinks if no valid target exists
 		remove_symlinks || die -q "Couldn't remove existing symlink"
-	elif [[ -e "${ROOT}${bindir}/emacs" ]]; then
+	elif [[ -e ${ROOT}${bindir}/emacs ]]; then
 		die -q "${ROOT}${bindir}/emacs exists but is not a symlink"
 	fi
 
@@ -263,7 +261,7 @@
 	if [[ ${#targets[@]} -gt 0 ]]; then
 		set_symlinks "${targets[${#targets[@]}-1]}" \
 			|| die -q "Couldn't set a new symlink"
-	elif [[ -f "${ROOT}${bindir}/xemacs" ]]; then
+	elif [[ -f ${ROOT}${bindir}/xemacs ]]; then
 		# no Emacs target found -- link ctags, etags etc. to XEmacs versions
 		set_symlinks xemacs nomain
 	fi