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

Commit 90deaf9a authored by Tao Bao's avatar Tao Bao Committed by Gerrit Code Review
Browse files

Merge "Print with newline for ui_print."

parents cf1af460 f0136424

install.cpp

+1 −5
Original line number Diff line number Diff line
@@ -420,11 +420,7 @@ static int try_update_binary(const char* path, ZipArchiveHandle zip, bool* wipe_ 
        LOG(ERROR) << "invalid \"set_progress\" parameters: " << line;

      }

    } else if (command == "ui_print") {

      if (!args.empty()) {

        ui->PrintOnScreenOnly("%s", args.c_str());

      } else {

        ui->PrintOnScreenOnly("\n");

      }

      ui->PrintOnScreenOnly("%s\n", args.c_str());

      fflush(stdout);

    } else if (command == "wipe_cache") {

      *wipe_cache = true;

updater/install.cpp

+0 −1
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ static void uiPrint(State* state, const std::string& buffer) { 
  for (auto& line : lines) {

    if (!line.empty()) {

      fprintf(ui->cmd_pipe, "ui_print %s\n", line.c_str());

      fprintf(ui->cmd_pipe, "ui_print\n");

    }

  }

updater/updater.cpp

+0 −1
Original line number Diff line number Diff line
@@ -191,7 +191,6 @@ int main(int argc, char** argv) { 
        }

        fprintf(cmd_pipe, "ui_print %s\n", line.c_str());

      }

      fprintf(cmd_pipe, "ui_print\n");

    }



    if (state.error_code != kNoError) {