SOURCES: license-installer.sh - fix for installing from local src.rpm

glen glen at pld-linux.org
Sun Aug 28 22:24:23 CEST 2005


Author: glen                         Date: Sun Aug 28 20:24:23 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix for installing from local src.rpm

---- Files affected:
SOURCES:
   license-installer.sh (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/license-installer.sh
diff -u SOURCES/license-installer.sh:1.5 SOURCES/license-installer.sh:1.6
--- SOURCES/license-installer.sh:1.5	Sun Aug 28 22:06:22 2005
+++ SOURCES/license-installer.sh	Sun Aug 28 22:24:17 2005
@@ -21,16 +21,18 @@
 		done
 	fi
 	if echo "$3" | grep '\.src\.rpm$' >/dev/null; then
-		( cd $SRPMDIR
+		(
 		if echo "$3" | grep '://' >/dev/null; then
+			cd $SRPMDIR
 			wget --passive-ftp -t0 "$3"
 		else
-			cp -f "$3" .
+			cp -f "$3" $SRPMDIR
+			cd $SRPMDIR
 		fi
 		rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i @BASE_NAME at .spec )
 		if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then
 			for i in @COPYSOURCES@; do
-				rpm2cpio $i | ( cd $TMPDIR; cpio -i $i )
+				rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i $i )
 			done
 		fi
 	   	)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/license-installer.sh?r1=1.5&r2=1.6&f=u




More information about the pld-cvs-commit mailing list