From ba867f50fceb73885cd1bf4130d7f4c7e51f1836 Mon Sep 17 00:00:00 2001 From: Filip Date: Tue, 14 May 2024 20:16:22 +0200 Subject: [PATCH] fix: corrupted bootstrap check, again --- .../main/java/com/octo4a/repository/BootstrapRepository.kt | 2 +- .../java/com/octo4a/repository/OctoPrintHandlerRepository.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/app/src/main/java/com/octo4a/repository/BootstrapRepository.kt b/app/app/src/main/java/com/octo4a/repository/BootstrapRepository.kt index a5260c1..e0befaf 100644 --- a/app/app/src/main/java/com/octo4a/repository/BootstrapRepository.kt +++ b/app/app/src/main/java/com/octo4a/repository/BootstrapRepository.kt @@ -270,5 +270,5 @@ class BootstrapRepositoryImpl( } override val isBootstrapInstalled: Boolean - get() = File("$FILES_PATH/bootstrap/build-version.txt").exists() + get() = File("$FILES_PATH/bootstrap/bootstrap").exists() } \ No newline at end of file diff --git a/app/app/src/main/java/com/octo4a/repository/OctoPrintHandlerRepository.kt b/app/app/src/main/java/com/octo4a/repository/OctoPrintHandlerRepository.kt index d2fddc3..f990264 100644 --- a/app/app/src/main/java/com/octo4a/repository/OctoPrintHandlerRepository.kt +++ b/app/app/src/main/java/com/octo4a/repository/OctoPrintHandlerRepository.kt @@ -352,6 +352,6 @@ class OctoPrintHandlerRepositoryImpl( // Validate installation val isInstalledProperly: Boolean - get() = !bootstrapRepository.runCommand("ls $octoprintPath").getOutputAsString() - .contains("No such") + get() = bootstrapRepository.runCommand("ls $octoprintPath && echo \"available\"").getOutputAsString() + .contains("available") } \ No newline at end of file