cleanup, reversed list order, +manpages +dir

Package-Manager: portage-2.0.53

4 files changed, 38 insertions, 49 deletions

diff --git a/app-admin/eselect-mysql/ChangeLog b/app-admin/eselect-mysql/ChangeLog
index e75f965b4701..943ba543e238 100644
--- a/app-admin/eselect-mysql/ChangeLog
+++ b/app-admin/eselect-mysql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/eselect-mysql
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-mysql/ChangeLog,v 1.1 2006/01/07 14:22:20 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-mysql/ChangeLog,v 1.2 2006/01/07 16:05:00 vivo Exp $
+
+  07 Jan 2006; Francesco Riosa <vivo@gentoo.org> files/mysql.eselect,
+  eselect-mysql-1.0.0.ebuild:
+  Removed unused function, added support for manpages and directoryes
+  Reverse order of version shown, "eselect mysql set 1" set the best version now
 
 *eselect-mysql-1.0.0 (07 Jan 2006)
 
diff --git a/app-admin/eselect-mysql/Manifest b/app-admin/eselect-mysql/Manifest
index 18183a724c44..9cf6265e615d 100644
--- a/app-admin/eselect-mysql/Manifest
+++ b/app-admin/eselect-mysql/Manifest
@@ -1,5 +1,5 @@
-MD5 cf6e53bc880c6951d3069af2d54bff18 ChangeLog 383
-MD5 5c6331d4c50a2009b46acd5dbc775032 eselect-mysql-1.0.0.ebuild 626
+MD5 0df1a06009020b9c5dca93b9e0e666a4 ChangeLog 635
+MD5 c069ec9f84ebf9fab35f5d0ccdcc8943 eselect-mysql-1.0.0.ebuild 614
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-eselect-mysql-1.0.0 0
-MD5 58e2ea65cb48093ca923f48a7b0124dc files/mysql.eselect 5022
+MD5 bd1b457c16989364746bba44b1ac0e0e files/mysql.eselect 4846
 MD5 fa97fe3e6f213f79ccf7ffbd53838095 metadata.xml 338
diff --git a/app-admin/eselect-mysql/eselect-mysql-1.0.0.ebuild b/app-admin/eselect-mysql/eselect-mysql-1.0.0.ebuild
index 02960e4cabe5..cd69d0b442d6 100644
--- a/app-admin/eselect-mysql/eselect-mysql-1.0.0.ebuild
+++ b/app-admin/eselect-mysql/eselect-mysql-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-mysql/eselect-mysql-1.0.0.ebuild,v 1.1 2006/01/07 14:22:20 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-mysql/eselect-mysql-1.0.0.ebuild,v 1.2 2006/01/07 16:05:00 vivo Exp $
 
 DESCRIPTION="Utility to change the default MySQL server being used"
 HOMEPAGE="http://www.gentoo.org/"
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.0_rc1"
diff --git a/app-admin/eselect-mysql/files/mysql.eselect b/app-admin/eselect-mysql/files/mysql.eselect
index b3ded855f095..b3a576724df7 100644
--- a/app-admin/eselect-mysql/files/mysql.eselect
+++ b/app-admin/eselect-mysql/files/mysql.eselect
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: mysql.eselect,v 1.1 2006/01/07 14:22:20 vivo Exp $
+# $Id: mysql.eselect,v 1.2 2006/01/07 16:05:00 vivo Exp $
 
 DESCRIPTION="Manage the /usr/lib/*mysql* links"
 MAINTAINER="vivo@gentoo.org"
-SVN_DATE='$Date: 2006/01/07 14:22:20 $'
+SVN_DATE='$Date: 2006/01/07 16:05:00 $'
 VERSION=$(svn_date_to_version "${SVN_DATE}" )
 MYSQL_SYMLINK_CHECKDIR="${ROOT}/usr/sbin"
 ERR_NOT_FOUND="(not-found)"
@@ -18,7 +18,7 @@ function version4human() {
 	local x=${1}
 	local y=$(( x % 100 ))
 	x=$(( x / 100 ))
-	echo "MySQL-${x}.${y}.x"	
+	echo "MySQL-${x}.${y}.x"
 }
 
 # return a integer version
@@ -37,31 +37,12 @@ function version4bash() {
 # Return the versions currently installed
 
 find_versions() {
-	for servers in "${MYSQL_SYMLINK_CHECKDIR}/mysqld-"* ; do
+	# "eselect mysql set 1" will always set the best version
+	for servers in $(ls "${MYSQL_SYMLINK_CHECKDIR}/mysqld-"* | sort -r) ; do
 		echo "$(version4human "${servers##*-}")"
 	done
 }
 
-# Create a symlink for a given file
-#
-# $1 - original file name
-# $2 - MySQL version
-
-add_symlink() {
-	local fname="${1}"
-	local ver="${2}"
-	local lname
-	
-	[[ -z "${fname}" ]] || [[ -z "${ver}" ]] && return 1
-	
-	if [[ -f "${fname}" ]] ; then
-		pushd $( dirname "${fname}" ) 1> /dev/null
-			lname="$( basename "${fname}" )"
-			ln -sf "${lname}" "${lname%"-${ver}"}"
-		popd 1> /dev/null
-	fi
-}
-
 # Check if a symlink could be created for a specific file
 #
 # $1 - original file name
@@ -74,15 +55,16 @@ check_symlink() {
 
 	[[ -z "${fname}" ]] || [[ -z "${ver}" ]] && return 1
 
-	local lname="${fname%"-${ver}"}"
+	local lname="${fname/"-${ver}"/}"
 
 	# check link source
-	[[ -f ${fname} ]] || ret=$(( ret +1 ))
+	[[ -f ${fname} ]] || [[ -d ${fname} ]] || ret=$(( ret +1 ))
 
 	# check link target
-	[[ ! -L "${lname}" ]] && [[ -f "${lname}" ]] && ret=$(( ret +2 ))
-	[[ -d "${lname}" ]] && ret=$(( ret +4 ))
-	#[[ -L "${lname}" ]] && return 0
+	# not checking for directory (want to keep "/etc/mysql")
+	[[ ! -L "${lname}" ]] \
+	&& [[ -f "${lname}" ]] \
+	&& ret=$(( ret +2 ))
 
 	return $ret
 
@@ -123,13 +105,13 @@ get_mysqlversion_fromlist() {
 get_current_mysqlversion() {
 	link=$(readlink ${MYSQL_SYMLINK_CHECKDIR}/mysqld)
 	version=${link##*-}
-	
+
 	if ! is_number "${version}" || [[ "${version}" == "" ]] ; then
-		version="(unset)"
+		version="${ERR_UNSET}"
 		echo "${version}"
 	else
 		echo $(version4human "${version}")
-	fi	
+	fi
 }
 
 set_current_mysqlversion() {
@@ -142,7 +124,7 @@ set_current_mysqlversion() {
 	# perform a check on the entire file list
 	while read fname ; do
 		dir="${ROOT}/$(dirname "${fname}")"
-		if [[ "${dir}" != "${lastdir}" ]] ; then 
+		if [[ "${dir}" != "${lastdir}" ]] ; then
 			cd "${dir}"
 			lastdir="${dir}"
 		fi
@@ -154,20 +136,22 @@ set_current_mysqlversion() {
 			"File \"${ROOT}/${fname}\" is not suitable for symlink (${ret})"
 		fi
 	done < "$ROOT/usr/share/mysql-${version}/.exe-list"
-	
+
 	# it's ok to do the effective work now
 	while read fname ; do
 		dir="${ROOT}/$(dirname "${fname}")"
-		if [[ "${dir}" != "${lastdir}" ]] ; then 
+		if [[ "${dir}" != "${lastdir}" ]] ; then
 			cd "${dir}"
 			lastdir="${dir}"
 		fi
 		lname="$(basename "${fname}")"
-		ln -sf "${lname}" "${lname%"-${version}"}"
+		ln -sf "${lname}" "${lname/"-${version}"/}"
+		[[ ! -L "${lname/"-${version}"/}" ]] \
+		&& write_warning_msg "FAILED: cd \"${dir}\" && ln -sf \"${lname}\" \"${lname/"-${version}"/}\""
 	done < "$ROOT/usr/share/mysql-${version}/.exe-list"
-	
+
 	cd "${CWD}"
-	
+
 }
 
 ### show action ###
@@ -189,7 +173,7 @@ describe_list() {
 }
 
 do_list() {
-	versions=( $(find_versions ) )
+	versions=( $(find_versions) )
 	current=$(get_current_mysqlversion)
 
 	write_list_start "Available MYSQL versions:"
@@ -215,7 +199,7 @@ describe_set() {
 }
 
 do_set() {
-	
+
 	local version versions
 	versions=( $(find_versions) )
 
@@ -223,13 +207,13 @@ do_set() {
 		# no parameter
 		die -q "You didn't tell me which version of MYSQL to use"
 	fi
-	
+
 	version=$(get_mysqlversion_fromlist $1)
-	
+
 	if [[ ${version} == "${ERR_NOT_FOUND}" ]] ; then
 		die -q "I don't recognise that version of MYSQL"
 	fi
-	
+
 	set_current_mysqlversion "$(version4bash "${version}")"
 }