[Libreoffice-commits] core.git: bin/update

[Markus Mohrhard]

 bin/update/make_incremental_update.sh |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

New commits:
commit d239ac8e4b6f01d350c89f067659e0d86f9a8f0e
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu Sep 28 14:58:54 2017 +0200

    fix the command line argument limit problem for incremental build generation
    
    Change-Id: I934c8196e260573cd0bc4f74066ea6082ab3c6c3

diff --git a/bin/update/make_incremental_update.sh b/bin/update/make_incremental_update.sh
index 72286f06ce8a..661951af0498 100755
--- a/bin/update/make_incremental_update.sh
+++ b/bin/update/make_incremental_update.sh
@@ -102,7 +102,8 @@ fi
 workdir="$newdir.work"
 updatemanifestv2="$workdir/updatev2.manifest"
 updatemanifestv3="$workdir/updatev3.manifest"
-archivefiles="updatev2.manifest updatev3.manifest"
+echo "updatev2.manifest" >> $workdir/files.txt
+echo "updatev3.manifest" >> $workdir/files.txt
 
 mkdir -p "$workdir"
 
@@ -162,7 +163,7 @@ for ((i=0; $i<$num_oldfiles; i=$i+1)); do
       $BZIP2 -cz9 "$newdir/$f" > "$workdir/$f"
       copy_perm "$newdir/$f" "$workdir/$f"
       make_add_if_not_instruction "$f" "$updatemanifestv3"
-      archivefiles="$archivefiles \"$f\""
+      echo $f >> $workdir/files.txt
       continue 1
     fi
 
@@ -172,7 +173,7 @@ for ((i=0; $i<$num_oldfiles; i=$i+1)); do
       $BZIP2 -cz9 "$newdir/$f" > "$workdir/$f"
       copy_perm "$newdir/$f" "$workdir/$f"
       make_add_instruction "$f" "$updatemanifestv2" "$updatemanifestv3" 1
-      archivefiles="$archivefiles \"$f\""
+      echo $f >> $workdir/files.txt
       continue 1
     fi
 
@@ -219,11 +220,11 @@ for ((i=0; $i<$num_oldfiles; i=$i+1)); do
         make_patch_instruction "$f" "$updatemanifestv2" "$updatemanifestv3"
         mv -f "$patchfile" "$workdir/$f.patch"
         rm -f "$workdir/$f"
-        archivefiles="$archivefiles \"$f.patch\""
+        echo $f.patch >> $workdir/files.txt
       else
         make_add_instruction "$f" "$updatemanifestv2" "$updatemanifestv3"
         rm -f "$patchfile"
-        archivefiles="$archivefiles \"$f\""
+        echo $f >> $workdir/files.txt
       fi
     fi
   else
@@ -262,7 +263,7 @@ for ((i=0; $i<$num_newfiles; i=$i+1)); do
   fi
 
 
-  archivefiles="$archivefiles \"$f\""
+  echo $f >> $workdir/files.txt
 done
 
 notice ""
@@ -305,8 +306,8 @@ if [[ -n $CHANNEL_ID ]]
 then
   mar_command="$mar_command -H $CHANNEL_ID"
 fi
-mar_command="$mar_command -C \"$workdir\" -c output.mar"
-eval "$mar_command $archivefiles"
+mar_command="$mar_command -C \"$workdir\" -c output.mar -f $workdir/files.txt"
+eval "$mar_command"
 mv -f "$workdir/output.mar" "$archive"
 
 # cleanup