From aea6695b3cbba2ba0d114fa546038401fdf762d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Sch=C3=BCtt?= <ole.schuett@cp2k.org>
Date: Thu, 19 Feb 2015 16:38:43 +0000
Subject: [PATCH] Doxify: Use mktemp instead of hard-coded filenames

svn-origin-rev: 15089
---
 tools/doxify/doxify.sh | 75 +++++++++++++-----------------------------
 1 file changed, 23 insertions(+), 52 deletions(-)

diff --git a/tools/doxify/doxify.sh b/tools/doxify/doxify.sh
index 5d2936dda9..a304977a27 100755
--- a/tools/doxify/doxify.sh
+++ b/tools/doxify/doxify.sh
@@ -1,63 +1,34 @@
 #!/bin/bash
 
-export DEBUG=0 # Set to 0 for no debugging, 1 for debugging
+DEBUG=0 # Set to 0 for no debugging, 1 for debugging
 SCRIPTDIR=$(cd $(dirname "$0"); pwd) # Pick up full path to scripts from wherever doxify.sh lives
 
-for file in "$@"
-do 
+for file in "$@"; do
 
-# First apply the pre-processing script to get rid of any double & type lines
-    if [ $DEBUG == 1 ] 
-    then
-	$SCRIPTDIR/remove_double_ampersands.pl $file $file.preprocessed 1 
-    else 
-	$SCRIPTDIR/remove_double_ampersands.pl $file $file.preprocessed 
-    fi
+   # generate temp-file names
+   tmp_file1=`mktemp`
+   tmp_file2=`mktemp`
+   tmp_file3=`mktemp`
 
-# Run the fixcomments.pl script. This adds comment blocks to any subroutine/function 
-# definitions that don't have any and checks that existing comments are complete, 
-# fixing these if required. 
-    if [ $DEBUG == 1 ] 
-    then
-	$SCRIPTDIR/fixcomments.pl $file.preprocessed $file.tmp 1
-    else
-	$SCRIPTDIR/fixcomments.pl $file.preprocessed $file.tmp
-    fi
+   # First apply the pre-processing script to get rid of any double & type lines
+   $SCRIPTDIR/remove_double_ampersands.pl $file $tmp_file1 $DEBUG
 
-# After adding comments, remove any double comment header lines
-    if [ $DEBUG == 1 ] 
-    then
-	$SCRIPTDIR/remove_extra_comments.pl $file.tmp $file.new 1
-    else
-	$SCRIPTDIR/remove_extra_comments.pl $file.tmp $file.new
-    fi
+   # Run the fixcomments.pl script. This adds comment blocks to any subroutine/function
+   # definitions that don't have any and checks that existing comments are complete,
+   # fixing these if required.
+   $SCRIPTDIR/fixcomments.pl $tmp_file1 $tmp_file2 $DEBUG
 
-# DEBUG: dump difference of original and final commented file into diffs.txt so we 
-# can look at what was changed. Used for debugging and can probably be omitted for 
-# the final version
-# Also runs tkdiff. You only want to run tkdiff on a small number of files
-# Change the path to location of tkdiff on your system. 
-    if [ $DEBUG == 1 ] 
-    then 
-	echo "Diff for file $file" >> diffs.txt
-	diff $file.preprocessed $file.new >> diffs.txt
-	echo " " >> $diffs.txt
-	cp $file $file.orig  # copy original input to *.orig as and tkdiff this
-	/Applications/TkDiff.app/Contents/MacOS/tkdiff $file.orig $file &
-    fi
+   # After adding comments, remove any double comment header lines
+   $SCRIPTDIR/remove_extra_comments.pl $tmp_file2 $tmp_file3 $DEBUG
 
-# Copy the final modified source file on top of the original file
-diff $file $file.new >/dev/null
-if [ $? == 1 ]
-then
-    cp $file.new $file
-fi
+   # Copy the final modified source file on top of the original file
+   if (! cmp -s $file $tmp_file3) ; then
+       cp $tmp_file3 $file
+   fi
 
-# Remove any uneeded output files 
-    rm -f $file.tmp $file.preprocessed $file.new 
-    if [ $DEBUG == 0 ] # We only remove .orig file if Tkdiff is not used
-    then 
-	rm -f $file.orig
-    fi
+   # Remove temp-files
+   rm -f $tmp_file1 $tmp_file2 $tmp_file3
 
-done 
+done
+
+#EOF