Additionally - fix some shellcheck warnings in repack.sh Change-Id: I2cbc6516c54a4f4e4ecef817ed9fe90b0a460faa