Changeset 17364

Timestamp:

05/08/06 06:40:51 (3 years ago)

Author:

bonefish

Message:

Workaround that fixes MIME DB problems under Linux, at least when
building an image from the scratch (with empty attributes and objects
dirs). This closes bugs 194 and 253.

Files:

• haiku/trunk/build/scripts/build_haiku_image (modified) (3 diffs)

haiku/trunk/build/scripts/build_haiku_image

@@ -81 +81 @@
 $mkdir -p $mimeDBDest
 mkdir -p $tmpDir
+mimeTmpDir=$tmpDir/mime
+mimeTmpIndex=0
+
+# create tmp dir for the MIME conversion stuff
+mkdir -p $mimeTmpDir
 
 echo "Installing MIME database ..."
@@ -89 +94 @@
 
         # compile rdef to rsrc file and the rsrc file to attributes
-        tmpFile=$tmpDir/mimedb$$.rsrc
-        tmpFile2=$tmpDir/mimedb$$.mime
+        mimeTmpIndex=$[$mimeTmpIndex + 1]
+        tmpFile=$mimeTmpDir/mimedb$$_${mimeTmpIndex}.rsrc
+        tmpFile2=$mimeTmpDir/mimedb$$_${mimeTmpIndex}.mime
         $rc -o $tmpFile $inSuperFile
         mkdir -p $tmpFile2
         $resattr -O -o $tmpFile2 $tmpFile
         $cp -r ${sPrefix}$tmpFile2 $outSuperDir
-        rm -rf $tmpFile $tmpFile2
 
         # iterate through the sub types
@@ -105 +110 @@
 
                         # compile rdef to rsrc file and the rsrc file to attributes
-                        tmpFile=$tmpDir/mimedb$$.rsrc
-                        tmpFile2=$tmpDir/mimedb$$.mime
+                        mimeTmpIndex=$[$mimeTmpIndex + 1]
+                        tmpFile=$mimeTmpDir/mimedb$$_${mimeTmpIndex}.rsrc
+                        tmpFile2=$mimeTmpDir/mimedb$$_${mimeTmpIndex}.mime
                         $rc -o $tmpFile $inSubFile
                         $resattr -O -o $tmpFile2 $tmpFile
                         $cp ${sPrefix}$tmpFile2 $outSubFile
-                        rm -f $tmpFile $tmpFile2
                 fi
         done
 done
 
+# cleanup tmp dir
+rm -rf $mimeTmpDir
 
 # unmount