X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=misc%2Fxonotic_export.sh;h=5cd39211d4be00b076f2b6ea56ac117dd2fe8f6e;hb=90533079c873b31458a272ed4b7ffc90c593e1f5;hp=ed09a390c9717dc040891b7fe80c248c32d061a0;hpb=94e477e466bb368efd2a8bee056c94a1547616e1;p=xonotic%2Fgmqcc.git

diff --git a/misc/xonotic_export.sh b/misc/xonotic_export.sh
index ed09a39..5cd3921 100755
--- a/misc/xonotic_export.sh
+++ b/misc/xonotic_export.sh
@@ -9,7 +9,7 @@ else
     pushd qcsrc > /dev/null
     if [ ! -d client -o ! -d common -o ! -d dpdefs -o ! -d menu -o ! -d server -o ! -d warpzonelib ]; then
         echo "this doesnt look like a xonotic source tree, aborting"
-        popd >> /dev/null
+        popd > /dev/null
         exit 1
     fi
 fi
@@ -20,33 +20,33 @@ if [ $? -ne 0 ]; then
     echo "not a git directory, continuing without rebase"
 else
     echo -n "resetting git state and updating ... "
-    git reset --hard HEAD > /dev/null
-    git pull > /dev/null
+    git reset --hard HEAD > /dev/null 2>&1
+    git pull > /dev/null 2>&1
     echo "complete"
 fi
 
-echo -n "removing redundant files ... "
-rm -f autocvarize.pl
+echo -n "generate precache for csqc ..."
+./collect-precache.sh > /dev/null 2>&1
+echo "complete"
+
+echo -n "removing redundant files ..."
+rm -f Makefile
 rm -f autocvarize-update.sh
+rm -f autocvarize.pl
 rm -f collect-precache.sh
 rm -f fteqcc-bugs.qc
 rm -f i18n-badwords.txt
 rm -f i18n-guide.txt
-rm -rf server-testcase
-rm -f Makefile
-rm -f *.src
 echo "complete"
 
-echo -n "creating prog.src files ... "
-find client common warpzonelib csqcmodellib -type f > csprogs.src
-ls server/w_*.qc | cat >> csprogs.src
-find server common warpzonelib csqcmodellib -type f > progs.src
-ls server/w_*.qc | cat >> progs.src
-find menu common warpzonelib -type f > menu.src
-ls server/w_*.qc | cat >> menu.src
+echo -n "creating projects ..."
+echo "client" >  dirs
+echo "server" >> dirs
+echo "menu"   >> dirs
+
 echo "complete"
 
-echo -n "creating zip archive ... "
+echo -n "creating zip archive ..."
 zip -r -9 ../xonotic.zip * > /dev/null
 echo "complete"