[gentoo-commits] proj/udev-gentoo-scripts:master commit in: helpers/, init.d/, /, test/

[William Hubbs]

commit:     93d41dcc49407c4885de474df0eaf7a83ee0babd
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 18:20:25 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 20:55:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/udev-gentoo-scripts.git;a=commit;h=93d41dcc

remove shell-compat-KV.sh helper

This code is used only in the udev init script, so we can merge it into
the script. The tests were also updated to support this.

---
 Makefile                   |    4 ---
 helpers/shell-compat-KV.sh |   47 --------------------------------------------
 init.d/udev                |   32 ++++++++++++++++++++++++++++-
 test/test_kv_to_int.sh     |    2 +-
 4 files changed, 31 insertions(+), 54 deletions(-)

diff --git a/Makefile b/Makefile
index 028dcec..3fbfda4 100644
--- a/Makefile
+++ b/Makefile
@@ -13,16 +13,12 @@ HELPERS = \
 	helpers/net.sh \
 	helpers/write_root_link_rule
 
-HELPERS_NOEXE = \
-	helpers/shell-compat-KV.sh
-
 all:
 	@echo "Run make install DESTDIR="
 
 install:
 	@install -d $(DESTDIR)$(LIBUDEV)
 	@install -m 0755 $(HELPERS) $(DESTDIR)$(LIBUDEV)
-	@install -m 0644 $(HELPERS_NOEXE) $(DESTDIR)$(LIBUDEV)
 	@install -d $(DESTDIR)$(RULESDIR)
 	@install -m 0644 rules.d/??-*.rules $(DESTDIR)$(RULESDIR)
 	@install -d $(DESTDIR)$(CONFD)

diff --git a/helpers/shell-compat-KV.sh b/helpers/shell-compat-KV.sh
deleted file mode 100644
index af42edc..0000000
--- a/helpers/shell-compat-KV.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# provides get_KV and KV_to_int as not all openrc-versions installed via ebuild have these
-
-cmd_exist()
-{
-	type "$1" >/dev/null 2>&1
-}
-
-# does exist in baselayout-1
-# does not exist in openrc, but is added by openrc-ebuild since some time
-if ! cmd_exist KV_to_int; then
-	KV_to_int() {
-		[ -z $1 ] && return 1
-
-		local x=${1%%[!0-9.]*} y= z=
-		local KV_MAJOR=${x%%.*}
-		y=${x#*.}
-		[ "$x" = "$y" ] && y=0.0
-		local KV_MINOR=${y%%.*}
-		z=${y#*.}
-		[ "$y" = "$z" ] && z=0
-		local KV_MICRO=${z%%.*}
-		local KV_int=$((${KV_MAJOR} * 65536 + ${KV_MINOR} * 256 + ${KV_MICRO} ))
-
-		# We make version 2.2.0 the minimum version we will handle as
-		# a sanity check ... if its less, we fail ...
-		[ "${KV_int}" -lt 131584 ] && return 1
-	
-		echo "${KV_int}"
-	}
-fi
-
-# same as KV_to_int
-if ! cmd_exist get_KV; then
-	_RC_GET_KV_CACHE=""
-	get_KV() {
-		[ -z "${_RC_GET_KV_CACHE}" ] \
-			&& _RC_GET_KV_CACHE="$(uname -r)"
-
-		echo "$(KV_to_int "${_RC_GET_KV_CACHE}")"
-
-		return $?
-	}
-fi
-

diff --git a/init.d/udev b/init.d/udev
index ea10111..5e41bcc 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -27,8 +27,36 @@ depend()
 	keyword -vserver -lxc
 }
 
-# get_KV and KV_to_int
-. /lib/udev/shell-compat-KV.sh
+KV_to_int()
+{
+	[ -z $1 ] && return 1
+
+	local x=${1%%[!0-9.]*} y= z=
+	local KV_MAJOR=${x%%.*}
+	y=${x#*.}
+	[ "$x" = "$y" ] && y=0.0
+	local KV_MINOR=${y%%.*}
+	z=${y#*.}
+	[ "$y" = "$z" ] && z=0
+	local KV_MICRO=${z%%.*}
+	local KV_int=$((${KV_MAJOR} * 65536 + ${KV_MINOR} * 256 + ${KV_MICRO} ))
+
+	# We make version 2.2.0 the minimum version we will handle as
+	# a sanity check ... if its less, we fail ...
+	[ "${KV_int}" -lt 131584 ] && return 1
+	
+	echo "${KV_int}"
+}
+
+_RC_GET_KV_CACHE=""
+get_KV()
+{
+	if [ -z "${_RC_GET_KV_CACHE}" ] ; then
+		_RC_GET_KV_CACHE="$(uname -r)"
+	fi
+	echo "$(KV_to_int "${_RC_GET_KV_CACHE}")"
+	return $?
+}
 
 # FIXME
 # Instead of this script testing kernel version, udev itself should

diff --git a/test/test_kv_to_int.sh b/test/test_kv_to_int.sh
index 917f243..6bca65d 100755
--- a/test/test_kv_to_int.sh
+++ b/test/test_kv_to_int.sh
@@ -3,7 +3,7 @@
 oneTimeSetUp()
 {
 	unset -f KV_to_int
-	. ../helpers/shell-compat-KV.sh
+	. ../init.d/udev
 }
 
 check_kv()