[gentoo-commits] gentoo-x86 commit in eclass: webapp.eclass

[Benedikt Boehm (hollow)]

hollow      08/02/22 13:53:38

  Modified:             webapp.eclass
  Log:
  replace sed and [] calls with bash expansion

Revision  Changes    Path
1.52                 eclass/webapp.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/webapp.eclass?rev=1.52&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/webapp.eclass?rev=1.52&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/webapp.eclass?r1=1.51&r2=1.52

Index: webapp.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- webapp.eclass	22 Feb 2008 13:44:41 -0000	1.51
+++ webapp.eclass	22 Feb 2008 13:53:38 -0000	1.52
@@ -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/eclass/webapp.eclass,v 1.51 2008/02/22 13:44:41 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.52 2008/02/22 13:53:38 hollow Exp $
 #
 # @ECLASS: webapp.eclass
 # @MAINTAINER:
@@ -48,9 +48,7 @@
 webapp_checkfileexists() {
 	debug-print-function $FUNCNAME $*
 
-	local my_prefix
-
-	[ -n "${2}" ] && my_prefix="${2}/" || my_prefix=
+	local my_prefix=${2:+${2}/}
 
 	if [ ! -e "${my_prefix}${1}" ]; then
 		msg="ebuild fault: file '${1}' not found"
@@ -67,17 +65,17 @@
 
 webapp_strip_appdir() {
 	debug-print-function $FUNCNAME $*
-	echo "${1}" | sed -e "s|${MY_APPDIR}/||g;"
+	echo "${1#${MY_APPDIR}/}"
 }
 
 webapp_strip_d() {
 	debug-print-function $FUNCNAME $*
-	echo "${1}" | sed -e "s|${D}||g;"
+	echo "${1#${D}}"
 }
 
 webapp_strip_cwd() {
 	debug-print-function $FUNCNAME $*
-	echo "${1}" | sed -e 's|/./|/|g;'
+	echo "${1/#.\///}"
 }
 
 webapp_getinstalltype() {
@@ -231,12 +229,7 @@
 	# do NOT change the naming convention used here without changing all
 	# the other scripts that also rely upon these names
 
-	local my_file
-	if [ -z "${3}" ]; then
-		my_file="${1}-$(basename "${2}")"
-	else
-		my_file="${1}-${3}"
-	fi
+	local my_file="${1}-${3:-$(basename "${2}")}"
 
 	elog "(${1}) config file '${my_file}'"
 	cp "${2}" "${D}/${MY_SERVERCONFIGDIR}/${my_file}"



-- 
gentoo-commits@l.g.o mailing list