Ticket #26472: 0001-fixup-Bug-4234-Use-the-Firefox-Update-Process-for-To.patch

File 0001-fixup-Bug-4234-Use-the-Firefox-Update-Process-for-To.patch, 2.3 KB (added by boklm, 14 months ago)
  • tools/update-packaging/make_incremental_update.sh

    From 510fce90cbc2e667f732a9c2b6579fc0a0983311 Mon Sep 17 00:00:00 2001
    From: Nicolas Vigier <boklm@torproject.org>
    Date: Mon, 25 Jun 2018 10:44:17 +0200
    Subject: [PATCH] fixup! Bug 4234: Use the Firefox Update Process for Tor
     Browser.
    
    Bug 26472: fix make_incremental_update.sh following addition of set -e
    ---
     tools/update-packaging/make_incremental_update.sh | 12 ++++++------
     1 file changed, 6 insertions(+), 6 deletions(-)
    
    diff --git a/tools/update-packaging/make_incremental_update.sh b/tools/update-packaging/make_incremental_update.sh
    index 263ec5a..3266ab2 100755
    a b if [ -d "$newdir/$ext_path" ]; then 
    143143  # NoScript is a packed extension, so we simply compare the old and the new
    144144  # .xpi files.
    145145  noscript_path="$ext_path/$noscript"
    146   diff -a "$olddir/$noscript_path" "$newdir/$noscript_path" > /dev/null
    147   rc=$?
     146  rc=0
     147  diff -a "$olddir/$noscript_path" "$newdir/$noscript_path" > /dev/null || rc=$?
    148148  if [ $rc -gt 1 ]; then
    149149    notice "Unexpected exit $rc from $noscript_path diff command"
    150150    exit 2
    if [ -d "$newdir/$ext_path" ]; then 
    164164    # too. We need to determine if any of the unpacked files have changed.
    165165    # Since that is messy, we simply compare the old install.rdf file to the
    166166    # new one.
     167    rc=0
    167168    diff "$olddir/$unpacked_https_e_install_rdf"     \
    168           "$newdir/$unpacked_https_e_install_rdf" > /dev/null
    169     rc=$?
     169          "$newdir/$unpacked_https_e_install_rdf" > /dev/null || rc=$?
    170170    if [ $rc -gt 1 -a -e "$olddir/$unpacked_https_e_install_rdf" ]; then
    171171      notice "Unexpected exit $rc from $unpacked_https_e_install_rdf diff command"
    172172      exit 2
    if [ -d "$newdir/$ext_path" ]; then 
    184184  else
    185185    # Both the old and new HTTPS-E extensions are packed. In this case we can
    186186    # simply compare the .xpi files to determine if the extension has changed.
    187     diff -a "$olddir/$packed_https_e_path" "$newdir/$packed_https_e_path" > /dev/null
    188     rc=$?
     187    rc=0
     188    diff -a "$olddir/$packed_https_e_path" "$newdir/$packed_https_e_path" > /dev/null || rc=$?
    189189    if [ $rc -gt 1 ]; then
    190190      notice "Unexpected exit $rc from $packed_https_e_path diff command"
    191191      exit 2