From: Richard Heck <rgheck@lyx.org>
Date: Sat, 3 Nov 2012 22:54:10 +0000 (-0400)
Subject: Fix a couple issues with the lyx-build script.
X-Git-Tag: 2.0.5~3
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=5191d51f6ab633aac230cada21c8de43ecce2338;p=features.git

Fix a couple issues with the lyx-build script.
---

diff --git a/development/tools/lyx-build b/development/tools/lyx-build
index cf780ff583..c86698fa9f 100755
--- a/development/tools/lyx-build
+++ b/development/tools/lyx-build
@@ -86,16 +86,18 @@ if [ ! -d "$BASE/lyx-patch/" ]; then
 	mkdir "$BASE/lyx-patch/" || exit 1;
 fi
 
-if [ ! -d lyx-$LAST ]; then 
+if [ ! -d $BASE/lyx-patch/lyx-$LAST ]; then 
   echo "Can't find directory for last version $LAST.";
   echo "Will try to download from LyX site....";
   read;
+  pushd $BASE/lyx-patch/;
   wget ftp://ftp.lyx.org/pub/lyx/stable/${FIRST}x/lyx-$LAST.tar.gz;
   tar -zxvf lyx-$LAST.tar.gz;
   if [ ! -f lyx-$LAST.tar.gz ]; then
     echo "Still unable to find directory for last version $LAST.";
     exit 1;
   fi
+  popd;
 fi
 
 echo -n "Ready to make patch against $LAST...";
@@ -131,7 +133,9 @@ if [ -f $PATCH.gz.sig ]; then
 fi
 gpg -b $PATCH.gz
 xz -zc $PATCH > $PATCH.xz
-rm $PATCH.xz.sig;
+if [ -f $PATCH.xz.sig ]; then
+	rm $PATCH.xz.sig;
+fi
 gpg -b $PATCH.xz
 
 echo -n "Patch and signatures created...";