Alexandre Julliard : wine_release: Install files by moving them into place to avoid permission issues.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: ec1c4547363cdfc735fe717787025f62693de5f6
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=ec1c4547363cdfc735fe717787025f62693de5f6

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Sep 13 18:36:02 2007 +0200

wine_release: Install files by moving them into place to avoid permission issues.

---

 wine_release    |   10 ++++++----
 winedoc_release |   10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/wine_release b/wine_release
index e6ae152..482c4d2 100755
--- a/wine_release
+++ b/wine_release
@@ -6,6 +6,7 @@
 # usage: wine_release <old version> <new version>
 
 set -e
+umask 002
 
 if [ $# -lt 2 ]
 then
@@ -16,7 +17,7 @@ fi
 oldver=$1
 version=$2
 
-templates_dir="/home/winehq/opt/lostwages/templates"
+templates_dir="/home/winehq/opt/website/templates"
 tools_dir="/home/winehq/opt/git-tools"
 
 cd /home/winehq/opt/source
@@ -46,7 +47,7 @@ chmod +r fileidx xref
 ##chmod +r .glimpse*
 cd ../..
 
-(echo "wine-$version"; cat wine-versions) | uniq > wine-versions.new && mv wine-versions.new wine-versions
+(echo "wine-$version"; cat wine-versions) | uniq > wine-versions.new && mv -f wine-versions.new wine-versions
 
 # update man page and documentation
 echo "==== UPDATING DOCUMENTATION ===="
@@ -69,16 +70,17 @@ for f in $manpages
 do
   name=`basename $f .man`
   make -C `dirname $f` $name.man
-  nroff -man $f | ../bin/man2html --pgsize=100000 | $tools_dir/html2template -o $templates_dir/en/docs/$name.template
+  nroff -man $f | ../bin/man2html --pgsize=100000 | $tools_dir/html2template -o $name.template && mv -f $name.template $templates_dir/en/docs/$name.template
 done
 
+rm -f ../ds$version.txt
 git diff -M --stat wine-$oldver wine-$version >../ds$version.txt
 
 make htmlpages && rm -rf ../WineAPI && mv documentation/html ../WineAPI
 
 # Wine API Stats
 echo "==== UPDATING WINE API STATS PAGE ===="
-$tools_dir/winapi_stats > winapi_stats.template && mv winapi_stats.template $templates_dir/en/winapi_stats.template
+$tools_dir/winapi_stats > winapi_stats.template && mv -f winapi_stats.template $templates_dir/en/winapi_stats.template
 
 # cleanup source tree
 git clean -q -d -x
diff --git a/winedoc_release b/winedoc_release
index 165287f..63ae24f 100755
--- a/winedoc_release
+++ b/winedoc_release
@@ -6,6 +6,7 @@
 # usage: winedoc_release <winedoc version>
 
 set -e
+umask 002
 
 if [ $# -lt 1 ]
 then
@@ -36,7 +37,7 @@ echo "==== BUILDING SGML DOCUMENTATION ===="
 
 books="wineusr-guide winedev-guide winelib-guide"
 langs="en"
-site_base_dir="/home/winehq/opt/lostwages"
+site_base_dir="/home/winehq/opt/website"
 tools_dir="/home/winehq/opt/git-tools"
 guides_base_dir="$site_base_dir/docs"
 winehq_base_dir="$site_base_dir/templates"
@@ -47,7 +48,7 @@ for lang in $langs
 do
   [ -d $guides_base_dir/$lang ] || mkdir $guides_base_dir/$lang
   [ -d $winehq_base_dir/$lang/docs ] || mkdir $winehq_base_dir/$lang/docs
-  cp $tools_dir/winedoc.css $guides_base_dir/$lang
+  rm -f $guides_base_dir/$lang/winedoc.css && cp $tools_dir/winedoc.css $guides_base_dir/$lang
 
   cd $lang
   for book in $books
@@ -60,7 +61,7 @@ do
       docbook2html -u -d $tools_dir/winehtml.dsl $book.sgml
       docbook2pdf -d $tools_dir/wineprint.dsl $book.sgml
       docbook2ps -d $tools_dir/wineprint.dsl $book.sgml
-      mv $book.html $book.pdf $book.ps $guides_base_dir/$lang
+      mv -f $book.html $book.pdf $book.ps $guides_base_dir/$lang
     fi
 
     # build the online html version
@@ -68,7 +69,8 @@ do
     [ -d $winehq_base_dir/$lang/docs/$book ] || mkdir $winehq_base_dir/$lang/docs/$book
     for f in $book.web/*.htm
     do
-      $tools_dir/html2template -i $f -o $winehq_base_dir/$lang/docs/$book/`basename $f .htm`.template
+      outfile=`basename $f .htm`.template
+      $tools_dir/html2template -i $f -o $outfile && mv -f $outfile $winehq_base_dir/$lang/docs/$book/$outfile
     done
     rm -rf $book.web
   done