Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 995821a6 authored by Mitchell Wills's avatar Mitchell Wills Committed by android-build-merger
Browse files

Merge "Fix comment to reflect that the value passed to head is actually the... 

Merge "Fix comment to reflect that the value passed to head is actually the size" am: 04175fa5 am: 91a3c6f2
am: 14839881

Change-Id: I7059c4d0e5c2af008d3a7083b19b297829e83609
parents 03e8a49f 14839881

tools/generate-self-extracting-archive.py

+6 −6
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ def _pipe_bytes(src, dst): 
    dst.write(b)



_MAX_OFFSET_WIDTH = 20

def _generate_extract_command(start, end, extract_name):

def _generate_extract_command(start, size, extract_name):

  """Generate the extract command.



  The length of this string must be constant no matter what the start and end
@@ -101,7 +101,7 @@ def _generate_extract_command(start, end, extract_name): 


  Args:

    start: offset in bytes of the start of the wrapped file

    end: offset in bytes of the end of the wrapped file

    size: size in bytes of the wrapped file

    extract_name: of the file to create when extracted



  """
@@ -111,11 +111,11 @@ def _generate_extract_command(start, end, extract_name): 
  if len(start_str) != _MAX_OFFSET_WIDTH + 1:

    raise Exception('Start offset too large (%d)' % start)



  end_str = ('%d' % end).rjust(_MAX_OFFSET_WIDTH)

  if len(end_str) != _MAX_OFFSET_WIDTH:

    raise Exception('End offset too large (%d)' % end)

  size_str = ('%d' % size).rjust(_MAX_OFFSET_WIDTH)

  if len(size_str) != _MAX_OFFSET_WIDTH:

    raise Exception('Size too large (%d)' % size)



  return "tail -c %s $0 | head -c %s > %s\n" % (start_str, end_str, extract_name)

  return "tail -c %s $0 | head -c %s > %s\n" % (start_str, size_str, extract_name)





def main(argv):