If a file is already FatELF, do a replace instead of a glue.

icculus · Oct 4, 2009 · 2618459 · 2618459
1 parent 7a26b28
commit 2618459
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/misc/merge.sh b/misc/merge.sh
@@ -22,7 +22,13 @@ time for feh in bin boot etc lib opt sbin usr var ; do find /x86/$feh -type f -e
 for feh in `cat binaries-32` ; do
     mkdir -p --mode=0755 `dirname "/$feh"`
     if [ -f "/$feh" ]; then
-        ./fatelf-glue tmp-fatelf "/$feh" "/x86/$feh"
+        FATELF=0
+        ./fatelf-validate "/$feh" && ISFATELF=1
+        if [ "x$ISFATELF" = "x1" ]; then
+            ./fatelf-replace tmp-fatelf "/$feh" "/x86/$feh"
+        else
+            ./fatelf-glue tmp-fatelf "/$feh" "/x86/$feh"
+        fi
         chmod --reference="/$feh" tmp-fatelf
         mv tmp-fatelf "/$feh"
     else