From c5a9d785231e560a511e07ff5772854beef0a3ed Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 3 Aug 2021 00:04:43 -0700 Subject: [PATCH] use continue_dashcam for dashcam installer old-commit-hash: 3129e058f8835ecd67de8f8564cec5c7797dfbe2 --- selfdrive/ui/SConscript | 3 ++- selfdrive/ui/qt/setup/installer.cc | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/selfdrive/ui/SConscript b/selfdrive/ui/SConscript index e39c25f231..204f6e26b5 100644 --- a/selfdrive/ui/SConscript +++ b/selfdrive/ui/SConscript @@ -78,7 +78,8 @@ if arch != 'aarch64' and GetOption('setup'): ("dashcam_test", "dashcam3-staging"), ] for name, branch in installers: - d = {'BRANCH': f"'\"{branch}\"'"} + brand = "dashcam" if "dashcam" in branch else "openpilot" + d = {'BRANCH': f"'\"{branch}\"'", 'CONTINUE_SRC_PATH': f"'\"installer/continue_{brand}.sh\"'"} if "internal" in name: d['INTERNAL'] = "1" diff --git a/selfdrive/ui/qt/setup/installer.cc b/selfdrive/ui/qt/setup/installer.cc index c7055dcc87..1464e52ea0 100644 --- a/selfdrive/ui/qt/setup/installer.cc +++ b/selfdrive/ui/qt/setup/installer.cc @@ -182,7 +182,7 @@ void Installer::cloneFinished(int exitCode, QProcess::ExitStatus exitStatus) { #endif // write continue.sh - run("cp /data/openpilot/installer/continue_openpilot.sh /data/continue.sh.new"); + run("cp " INSTALL_PATH "/" CONTINUE_SRC_PATH " /data/continue.sh.new"); run("chmod +x /data/continue.sh.new"); run("mv /data/continue.sh.new " CONTINUE_PATH);