[patch] cvd.eclass and ebuild.sh patch

cvs.diff (text/plain), 7.22 KB, created by Georgi Georgiev on 2002-11-21 13:01:54 UTC

--- /var/tmp/portage/portage-2.0.44/work/portage-2.0.44/bin/ebuild.sh	2002-11-12 04:13:08.000000000 +0900
+++ ebuild.sh	2002-11-17 23:11:22.000000000 +0900
@@ -198,12 +198,12 @@
 
 einstall() {
 	if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
-		make prefix=${D}/usr \
-		    mandir=${D}/usr/share/man \
-		    infodir=${D}/usr/share/info \
-		    datadir=${D}/usr/share \
-		    sysconfdir=${D}/etc \
-		    localstatedir=${D}/var/lib \
+		make prefix="${D}"/usr \
+		    mandir="${D}"/usr/share/man \
+		    infodir="${D}"/usr/share/info \
+		    datadir="${D}"/usr/share \
+		    sysconfdir="${D}"/etc \
+		    localstatedir="${D}"/var/lib \
 		    "$@" install || die "einstall failed" 
 	else
 		die "no Makefile found"
@@ -329,9 +329,9 @@
 		export DESTTREE=""
 	else
 		export DESTTREE=$1
-		if [ ! -d ${D}${DESTTREE} ]
+		if [ ! -d "${D}${DESTTREE}" ]
 		then
-			install -d ${D}${DESTTREE}
+			install -d "${D}${DESTTREE}"
 		fi
 	fi
 }
@@ -342,9 +342,9 @@
 		export INSDESTTREE=""
 	else
 		export INSDESTTREE=$1
-		if [ ! -d ${D}${INSDESTTREE} ]
+		if [ ! -d "${D}${INSDESTTREE}" ]
 		then
-			install -d ${D}${INSDESTTREE}
+			install -d "${D}${INSDESTTREE}"
 		fi
 	fi
 }
@@ -447,7 +447,7 @@
 
 abort_compile() {
 	abort_handler "src_compile" $1
-	rm -f ${BUILDDIR}/compiled
+	rm -f "${BUILDDIR}/compiled"
 	exit 1
 }
 
@@ -474,16 +474,16 @@
 dyn_compile() {
 	trap "abort_compile" SIGINT SIGQUIT
 	export CFLAGS CXXFLAGS LIBCFLAGS LIBCXXFLAGS
-	if [ ${BUILDDIR}/.compiled -nt ${WORKDIR} ]
+	if [ "${BUILDDIR}/.compiled" -nt "${WORKDIR}" ]
 	then
 		echo ">>> It appears that ${PN} is already compiled; skipping."
 		echo ">>> (clean to force compilation)"
 		trap SIGINT SIGQUIT
 		return
 	fi
-	if [ -d ${S} ]
+	if [ -d "${S}" ]
 		then
-		cd ${S}
+		cd "${S}"
 	fi
 	#our custom version of libtool uses $S and $D to fix
 	#invalid paths in .la files
@@ -547,11 +547,11 @@
 dyn_install() {
 	local ROOT
 	trap "abort_install" SIGINT SIGQUIT
-	rm -rf ${BUILDDIR}/image
-	mkdir ${BUILDDIR}/image
-	if [ -d ${S} ]
+	rm -rf "${BUILDDIR}/image"
+	mkdir "${BUILDDIR}/image"
+	if [ -d "${S}" ]
 	then
-		cd ${S}
+		cd "${S}"
 	fi
 	echo
 	echo ">>> Install ${PF} into ${D} category ${CATEGORY}"
--- /var/portage/eclass/cvs.eclass	2002-11-19 22:20:37.000000000 +0900
+++ cvs.eclass	2002-11-22 03:57:18.000000000 +0900
@@ -111,13 +111,13 @@
 		#export SANDBOX_WRITE="$SANDBOX_WRITE:/foobar:/"
 		addwrite /foobar
 		addwrite /
-		mkdir -p /$DIR
+		mkdir -p "/$DIR"
 		export SANDBOX_WRITE=${SANDBOX_WRITE//:\/foobar:\/}
 	fi
 
 	# in case ECVS_TOP_DIR is a symlink to a dir, get the real dir's path,
 	# otherwise addwrite() doesn't work.
-	cd -P $ECVS_TOP_DIR > /dev/null
+	cd -P "$ECVS_TOP_DIR" > /dev/null
 	ECVS_TOP_DIR="`/bin/pwd`"
 	DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}"
 	cd $OLDPWD
@@ -126,16 +126,16 @@
 	
 	# disable the sandbox for this dir
 	# not just $DIR because we want to create moduletopdir/CVS too
-	addwrite $ECVS_TOP_DIR/$ECVS_MODULE
+	addwrite "$ECVS_TOP_DIR/$ECVS_MODULE"
 
 	# add option for local (non-recursive) fetching
 	[ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l"
 	
 	# prepare a cvspass file just for this session so that cvs thinks we're logged
 	# in at the cvs server. we don't want to mess with ~/.cvspass.
-	echo ":pserver:${ECVS_SERVER} A" > ${T}/cvspass
+	echo ":pserver:${ECVS_SERVER} A" > "${T}/cvspass"
 	export CVS_PASSFILE="${T}/cvspass"
-	chown $ECVS_RUNAS "${T}/cvspass"
+	chown "$ECVS_RUNAS" "${T}/cvspass"
 	#export CVSROOT=:pserver:${ECVS_USER}@${ECVS_SERVER}
 	
 	# Note: cvs update and checkout commands are unified.
@@ -156,15 +156,15 @@
 	
 	debug-print "$FUNCNAME: Root<-$newserver, Repository<-$repository"
 	debug-print "$FUNCNAME: entering directory $DIR"
-	cd /$DIR
+	cd "/$DIR"
 	
 	if [ ! -d "CVS" ]; then
 		# create a new CVS/ directory (checkout)
 		debug-print "$FUNCNAME: creating new cvs directory"
 		
 		mkdir CVS
-		echo $newserver > CVS/Root
-		echo $repository > CVS/Repository
+		echo "$newserver" > CVS/Root
+		echo "$repository" > CVS/Repository
 		touch CVS/Entries
 		
 		# if we're checking out a subdirectory only, create a CVS/ dir
@@ -172,8 +172,8 @@
 		# from there to get the full module.
 		if [ ! -d "$ECVS_TOP_DIR/$ECVS_MODULE/CVS" ]; then
 			debug-print "$FUNCNAME: Copying CVS/ directory to module top-level dir"
-			cp -r CVS $ECVS_TOP_DIR/$ECVS_MODULE/
-			echo $ECVS_MODULE > $ECVS_TOP_DIR/$ECVS_MODULE/CVS/Repository
+			cp -r CVS "$ECVS_TOP_DIR/$ECVS_MODULE/"
+			echo "$ECVS_MODULE" > "$ECVS_TOP_DIR/$ECVS_MODULE/CVS/Repository"
 		fi
 		
 	else
@@ -195,9 +195,9 @@
 			debug-print "$cvsdirs"
 
 			einfo "Modifying CVS dirs..."
-			for x in $cvsdirs; do
+			for x in "$cvsdirs"; do
 				debug-print "In $x"
-				echo $newserver > $x/Root
+				echo "$newserver" > "$x/Root"
 			done
 
 		fi
@@ -210,7 +210,7 @@
 
 	# Chowning the directory
 	if [ "${ECVS_RUNAS}" != "root" ]; then
-		chown -R "$ECVS_RUNAS" /$DIR
+		chown -R "$ECVS_RUNAS" "/$DIR"
 	fi
 
 	# finally run the cvs update command
@@ -268,51 +268,51 @@
 	fi
 
 	# log out and restore ownership
-	su $ECVS_RUNAS -c "cvs logout" &> /dev/null
-	chown root ${T}/cvspass
+	su "$ECVS_RUNAS" -c "cvs logout" &> /dev/null
+	chown root "${T}/cvspass"
 }
 
 cvs_src_unpack() {
 
-	debug-print-function $FUNCNAME $*
+	debug-print-function "$FUNCNAME" "$*"
 	cvs_fetch || die "died running cvs_fetch"
 
 	einfo "Copying $ECVS_MODULE/$ECVS_SUBDIR from $ECVS_TOP_DIR..."
 	debug-print "Copying module $ECVS_MODULE subdir $ECVS_SUBDIR local_mode=$ECVS_LOCAL from $ECVS_TOP_DIR..."
 	
 	# probably redundant, but best to make sure
-	mkdir -p $WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR
+	mkdir -p "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR"
 	
 	if [ -n "$ECVS_SUBDIR" ]; then
 		if [ -n "$ECVS_LOCAL" ]; then
-			cp -f $ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR/* $WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR
+			cp -f "$ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR"/* "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR"
 		else
-			cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR $WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR/..
+			cp -Rf "$ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR" "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR/.."
 		fi    
 	else
 		if [ -n "$ECVS_LOCAL" ]; then
-			cp -f $ECVS_TOP_DIR/$ECVS_MODULE/* $WORKDIR/$ECVS_MODULE
+			cp -f "$ECVS_TOP_DIR/$ECVS_MODULE/"* "$WORKDIR/$ECVS_MODULE"
 		else
-			cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE $WORKDIR
+			cp -Rf "$ECVS_TOP_DIR/$ECVS_MODULE" "$WORKDIR"
 		fi
 	fi
 	
 	# if the directory is empty, remove it; empty directories cannot exist in cvs.
 	# this happens when fex. kde-source requests module/doc/subdir which doesn't exist.
 	# still create the empty directory in workdir though.
-	if [ "`ls -A $DIR`" == "CVS" ]; then
+	if [ "`ls -A \"$DIR\"`" == "CVS" ]; then
 		debug-print "$FUNCNAME: removing cvs-empty directory $ECVS_MODULE/$ECVS_SUBDIR"
-		rm -rf $DIR
+		rm -rf "$DIR"
 	fi
 	    
 	# implement some of base_src_unpack's functionality;
 	# note however that base.eclass may not have been inherited!
 	if [ -n "$PATCHES" ]; then
 		debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching"
-		cd $S
-		for x in $PATCHES; do
+		cd "$S"
+		for x in "$PATCHES"; do
 			debug-print "patching from $x"
-			patch -p0 < $x
+			patch -p0 < "$x"
 		done
 		# make sure we don't try to apply patches more than once, since
 		# cvs_src_unpack is usually called several times from e.g. kde-source_src_unpack