From 3cc36950acb74abbed73f114e6c997bfc3d0311e Mon Sep 17 00:00:00 2001 From: vincents Date: Mon, 8 Sep 2008 19:52:10 +0000 Subject: [PATCH] rpm snapshot build script: fixed removing fpc dir and typo in lazarus export dir git-svn-id: trunk@16489 - --- tools/install/create_lazarus_snapshot_rpm.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/install/create_lazarus_snapshot_rpm.sh b/tools/install/create_lazarus_snapshot_rpm.sh index 4f004394ee..8c0fbc5df8 100755 --- a/tools/install/create_lazarus_snapshot_rpm.sh +++ b/tools/install/create_lazarus_snapshot_rpm.sh @@ -45,6 +45,7 @@ if [ ! -f $FPCRPM ]; then exit fi +# extract the fpc snapshot, so we don't need to install it TmpFPCDir=~/tmp/fpc if [ -e $TmpFPCDir ]; then rm -rf $TmpFPCDir @@ -62,12 +63,11 @@ export FPC FPCDIR=$TmpFPCDir/usr/$LIB/fpc/$FPCVersion export FPCDIR cd - -rm -rf $TmpFPCDir # create a temporary copy of the lazarus sources for packaging LazVersion=$(./get_lazarus_version.sh) LazRelease=`echo $FPCRPM | sed -e 's/-/_/g'` -TmpDir=~/tmp/lazarus +TmpLazDir=~/tmp/lazarus rm -rf $TmpLazDir echo "extracting Lazarus source from local svn ..." @@ -97,5 +97,9 @@ cat rpm/lazarus.spec.template | \ # build rpm rpmbuild --target $ARCH -ba $SpecFile --nodeps +# remove the temp fpc dir +rm -rf $TmpFPCDir + + # end.