From 837488e4dde945155e3b494a42ad68a77e1bca9e Mon Sep 17 00:00:00 2001
From: CodeMasterCody3D <130433943+CodeMasterCody3D@users.noreply.github.com>
Date: Tue, 21 Jan 2025 03:59:36 -0600
Subject: [PATCH 1/4] Update install_menu.py

---
 kiauh/core/menus/install_menu.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kiauh/core/menus/install_menu.py b/kiauh/core/menus/install_menu.py
index f2516ba..d35caeb 100644
--- a/kiauh/core/menus/install_menu.py
+++ b/kiauh/core/menus/install_menu.py
@@ -51,8 +51,9 @@ class InstallMenu(BaseMenu):
             "5": Option(method=self.install_mainsail_config),
             "6": Option(method=self.install_fluidd_config),
             "7": Option(method=self.install_klipperscreen),
-            "8": Option(method=self.install_crowsnest),
-            "9": Option(method=self.install_droidklipp),  # Add DroidKlipp option
+            "8": Option(method=self.install_droidklipp),  # Add DroidKlipp option
+            "9": Option(method=self.install_crowsnest),
+            
         }
 
     def print_menu(self) -> None:

From 6853e97fb8a1063359743180885f957ee679fda5 Mon Sep 17 00:00:00 2001
From: CodeMasterCody3D <130433943+CodeMasterCody3D@users.noreply.github.com>
Date: Tue, 21 Jan 2025 04:05:10 -0600
Subject: [PATCH 2/4] Update droidklipp.py

fixed folder creation
---
 kiauh/components/droidklipp/droidklipp.py | 28 ++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/kiauh/components/droidklipp/droidklipp.py b/kiauh/components/droidklipp/droidklipp.py
index 65b24d8..d6c7025 100644
--- a/kiauh/components/droidklipp/droidklipp.py
+++ b/kiauh/components/droidklipp/droidklipp.py
@@ -4,14 +4,33 @@ import subprocess
 def install_droidklipp():
     try:
         print("Installing DroidKlipp...")
+
+        # Install necessary dependencies
         subprocess.run(['sudo', 'apt', 'install', '-y', 'adb', 'tmux'], check=True)
 
+        # Define the DroidKlipp repository URL and directory
         droidklipp_repo_url = "https://github.com/CodeMasterCody3D/DroidKlipp.git"
-        if not os.path.isdir('DroidKlipp'):
-            subprocess.run(['git', 'clone', droidklipp_repo_url], check=True)
+        droidklipp_dir = os.path.expanduser('~/DroidKlipp')
 
-        os.chdir('DroidKlipp')
+        # Check if DroidKlipp directory exists, if not create it
+        if not os.path.isdir(droidklipp_dir):
+            print("DroidKlipp folder not found, creating directory...")
+            os.makedirs(droidklipp_dir)
+
+        # Clone the repository if not already cloned
+        if not os.path.isdir(os.path.join(droidklipp_dir, '.git')):
+            print("Cloning the DroidKlipp repository...")
+            subprocess.run(['git', 'clone', droidklipp_repo_url, droidklipp_dir], check=True)
+        else:
+            print("DroidKlipp repository already exists.")
+
+        # Change to the DroidKlipp directory
+        os.chdir(droidklipp_dir)
+
+        # Set executable permissions for the installation script
         subprocess.run(['sudo', 'chmod', '+x', 'droidklipp.sh'], check=True)
+
+        # Run the installation script
         subprocess.run(['./droidklipp.sh'], check=True)
 
         print("DroidKlipp installation complete!")
@@ -19,3 +38,6 @@ def install_droidklipp():
         print(f"Error during installation: {e}")
     except Exception as e:
         print(f"Unexpected error: {e}")
+
+# Run the function
+install_droidklipp()

From a21e059328920ab649ffc42171a0124a947d94d3 Mon Sep 17 00:00:00 2001
From: CodeMasterCody3D <130433943+CodeMasterCody3D@users.noreply.github.com>
Date: Tue, 21 Jan 2025 04:08:48 -0600
Subject: [PATCH 3/4] Update droidklipp.py

fixed folder creating and bug
---
 kiauh/components/droidklipp/droidklipp.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/kiauh/components/droidklipp/droidklipp.py b/kiauh/components/droidklipp/droidklipp.py
index d6c7025..4e4bac1 100644
--- a/kiauh/components/droidklipp/droidklipp.py
+++ b/kiauh/components/droidklipp/droidklipp.py
@@ -1,11 +1,13 @@
-import os
-import subprocess
-
 def install_droidklipp():
     try:
-        print("Installing DroidKlipp...")
+        print("Are you sure you want to install DroidKlipp? (Y/N)")
+        user_confirmation = input().strip().lower()
 
-        # Install necessary dependencies
+        if user_confirmation != 'y':
+            print("DroidKlipp installation aborted.")
+            return
+
+        print("Installing DroidKlipp...")
         subprocess.run(['sudo', 'apt', 'install', '-y', 'adb', 'tmux'], check=True)
 
         # Define the DroidKlipp repository URL and directory
@@ -39,5 +41,4 @@ def install_droidklipp():
     except Exception as e:
         print(f"Unexpected error: {e}")
 
-# Run the function
-install_droidklipp()
+# Ensure you call this with proper confirmation before installation

From 2c045bb647c4a00156cf213096b470ed3f9cee17 Mon Sep 17 00:00:00 2001
From: CodeMasterCody3D <130433943+CodeMasterCody3D@users.noreply.github.com>
Date: Tue, 21 Jan 2025 04:11:03 -0600
Subject: [PATCH 4/4] Update droidklipp.py

forgot to add imports
---
 kiauh/components/droidklipp/droidklipp.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kiauh/components/droidklipp/droidklipp.py b/kiauh/components/droidklipp/droidklipp.py
index 4e4bac1..2248d4e 100644
--- a/kiauh/components/droidklipp/droidklipp.py
+++ b/kiauh/components/droidklipp/droidklipp.py
@@ -1,3 +1,6 @@
+import os
+import subprocess
+
 def install_droidklipp():
     try:
         print("Are you sure you want to install DroidKlipp? (Y/N)")