RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 09-Dec-2009 16:00:27
Branch: HEAD Handle: 2009120915002700
Modified files:
rpm/scripts brp-implant-ident-static brp-java-repack-jars
java.prov.sh java.req.sh javadeps.sh
Log:
get ride of some useless bashism: probably doesn't harm
Summary:
Revision Changes Path
1.2 +3 -2 rpm/scripts/brp-implant-ident-static
1.2 +7 -5 rpm/scripts/brp-java-repack-jars
1.3 +3 -2 rpm/scripts/java.prov.sh
1.3 +3 -2 rpm/scripts/java.req.sh
1.3 +6 -4 rpm/scripts/javadeps.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/scripts/brp-implant-ident-static
============================================================================
$ cvs diff -u -r1.1 -r1.2 brp-implant-ident-static
--- rpm/scripts/brp-implant-ident-static 20 Jun 2007 16:56:47 -0000
1.1
+++ rpm/scripts/brp-implant-ident-static 9 Dec 2009 15:00:27 -0000
1.2
@@ -17,7 +17,8 @@
trap cleanup 0 1 2 3 4 5 6 7 8 9 11 13 14 15
for library in `find $RPM_BUILD_ROOT -type f -exec file \{\} \; | grep
'current ar archive' | sed 's,:.*,,g' ` ; do
- pushd $tempdir > /dev/null
+ PUSHDIR=`pwd`
+ cd $tempdir > /dev/null
if test -n "$RPM_BUILD_ROOT" ; then
cleanedlibrary=`echo "$library" | sed s,"$RPM_BUILD_ROOT",,g`
else
@@ -30,5 +31,5 @@
ar r "$library" "$object"
done
rm -f *.o
- popd > /dev/null
+ cd $PUSHDIR > /dev/null
done
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/brp-java-repack-jars
============================================================================
$ cvs diff -u -r1.1 -r1.2 brp-java-repack-jars
--- rpm/scripts/brp-java-repack-jars 20 Jun 2007 16:56:47 -0000 1.1
+++ rpm/scripts/brp-java-repack-jars 9 Dec 2009 15:00:27 -0000 1.2
@@ -30,8 +30,9 @@
TMPDIR=`mktemp -d -p $RPM_BUILD_ROOT/tmp
$JARNAME.tmpdir.XXXXXXXXXX` || exit 1
JARDIR=`mktemp -d -p $RPM_BUILD_ROOT/tmp
$JARNAME.jardir.XXXXXXXXXX` || exit 1
TIMEREF=`mktemp -p $RPM_BUILD_ROOT/tmp
$JARNAME.timeref.XXXXXXXXXX` || exit 1
-
- pushd $TMPDIR > /dev/null
+
+ PUSHDIR=`pwd`
+ cd $TMPDIR > /dev/null
/usr/bin/unzip -qq -o $j
rm -f $j
@@ -66,13 +67,14 @@
cp $f $JARDIR/$f
touch --date="$DATE" $JARDIR/$f
done
- popd > /dev/null
+ cd $PUSHDIR > /dev/null
# Set the times of the directories.
touch --date="$DATE" `find $JARDIR -type d`
# make the jar
- pushd $JARDIR > /dev/null
+ PUSHDIR=`pwd`
+ cd $JARDIR > /dev/null
if [ -n "`find -type f`" ]; then
find -type f -print | LC_ALL=C sort | /usr/bin/zip -q
-X -9 $j -@
@@ -80,7 +82,7 @@
# Put the empty jar back
touch $j
fi
- popd > /dev/null
+ cd $PUSHDIR > /dev/null
# Cleanup.
rm -rf $TMPDIR
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/java.prov.sh
============================================================================
$ cvs diff -u -r1.2 -r1.3 java.prov.sh
--- rpm/scripts/java.prov.sh 25 May 2007 18:34:16 -0000 1.2
+++ rpm/scripts/java.prov.sh 9 Dec 2009 15:00:27 -0000 1.3
@@ -42,9 +42,10 @@
;;
*.jar)
if ! $JAR tf "$filename" | grep -q -e '(^..|^/|^\\)' ; then
- pushd $classdir > /dev/null
+ PUSHDIR=`pwd`
+ cd $classdir > /dev/null
$JAR xf "$filename"
- popd > /dev/null
+ cd $PUSHDIR > /dev/null
$JAR tf "$filename" | sed "s|^|$classdir/|g" | $0 "$@"
rm -fr $classdir/*
fi
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/java.req.sh
============================================================================
$ cvs diff -u -r1.2 -r1.3 java.req.sh
--- rpm/scripts/java.req.sh 25 May 2007 18:34:16 -0000 1.2
+++ rpm/scripts/java.req.sh 9 Dec 2009 15:00:27 -0000 1.3
@@ -53,9 +53,10 @@
;;
*.jar)
if ! $JAR tf "$filename" | grep -q -e '(^..|^/|^\\)' ; then
- pushd $classdir > /dev/null
+ PUSHDIR=`pwd`
+ cd $classdir > /dev/null
$JAR xf "$filename"
- popd > /dev/null
+ cd $PUSHDIR > /dev/null
$JAR tf "$filename" | sed "s|^|$classdir/|g" | $0 "$@"
rm -fr $classdir/*
fi
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/javadeps.sh
============================================================================
$ cvs diff -u -r1.2 -r1.3 javadeps.sh
--- rpm/scripts/javadeps.sh 25 May 2007 18:34:16 -0000 1.2
+++ rpm/scripts/javadeps.sh 9 Dec 2009 15:00:27 -0000 1.3
@@ -80,9 +80,10 @@
;;
*.jar)
if ! $JAR tf "$filename" | grep -q -e '(^..|^/|^\\)' ; then
- pushd $classdir > /dev/null
+ PUSHDIR=`pwd`
+ cd $classdir > /dev/null
$JAR xf "$filename"
- popd > /dev/null
+ cd $PUSHDIR > /dev/null
$JAR tf "$filename" | sed "s|^|$classdir/|g" | $0 "$@"
rm -fr $classdir/*
fi
@@ -100,9 +101,10 @@
;;
*.jar)
if ! $JAR tf "$filename" | grep -q -e '(^..|^/|^\\)' ; then
- pushd $classdir > /dev/null
+ PUSHDIR=`pwd`
+ cd $classdir > /dev/null
$JAR xf "$filename"
- popd > /dev/null
+ cd $PUSHDIR > /dev/null
$JAR tf "$filename" | sed "s|^|$classdir/|g" | $0 "$@"
rm -fr $classdir/*
fi
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
