Merge branch 'master' of github.com:crysxd/kiauh

Co-authored-by: dw-0 <domwil1091+github@gmail.com>

README.md

@@ -161,7 +161,7 @@ prompt and confirm by hitting ENTER.
 <tr>
 <th><a href="https://github.com/Clon1998/mobileraker_companion"><img src="https://raw.githubusercontent.com/Clon1998/mobileraker/master/assets/icon/mr_appicon.png" alt="OctoEverywhere Logo" height="64"></th>
 <th><a href="https://octoeverywhere.com/?source=kiauh_readme"><img src="https://octoeverywhere.com/img/logo.svg" alt="OctoEverywhere Logo" height="64"></a></th>
-<th><a href="https://octoeverywhere.com/?source=kiauh_readme"><img src="https://firebasestorage.googleapis.com/v0/b/octoapp-4e438.appspot.com/o/resources%2Foctoeverywhere%2FA.svg?alt=media&token=b5c9ac00-f6ca-484b-8dbf-34db944b8e0a" alt="OctoApp Logo" height="64"></a></th>
+<th><a href="https://octoapp.eu/?source=kiauh_readme"><img src="https://octoapp.eu/octoapp.webp" alt="OctoApp Logo" height="64"></a></th>
 </tr>
 
 <tr>

scripts/octoapp.sh

@@ -73,14 +73,12 @@ function octoapp_setup_dialog() {
         done
       fi
       blank_line
-      echo -e "| The setup will apply the same names to                |"
+      echo -e "| The setup will apply the same names to OctoApp        |"
-      echo -e "| OctoApp                                        |"
       blank_line
-      echo -e "| Please select the number of OctoApp instances  |"
+      echo -e "| Please select the number of OctoApp instances to      |"
-      echo -e "| to install. Usually one OctoApp instance per   |"
+      echo -e "| install. Usually one OctoApp instance per Moonraker   |"
-      echo -e "| Moonraker instance is required, but you may not       |"
+      echo -e "| instance is required, but you may not install more    |"
-      echo -e "| install more OctoApp instances than available  |"
+      echo -e "| OctoApp instances than available Moonraker instances. |"
-      echo -e "| Moonraker instances.                                  |"
       bottom_border
 
       ### ask for amount of instances
@@ -159,20 +157,6 @@ function octoapp_setup_dialog() {
   fi  # (( allowed_octoapp_count > 0 ))
 }
 
-function clone_octoapp() {
-  local repo=${1}
-
-  status_msg "Cloning OctoApp..."
-  ### force remove existing repos
-  [[ -d "${OCTOAPP_DIR}" ]] && rm -rf "${OCTOAPP_DIR}"
-
-  cd "${HOME}" || exit 1
-  if ! git clone "${repo}" "${OCTOAPP_DIR}"; then
-    print_error "Cloning OctoApp from\n ${repo}\n failed!"
-    exit 1
-  fi
-}
-
 function octoapp_install() {
   "${OCTOAPP_DIR}/install.sh" "$@"
 }

scripts/ui/install_menu.sh

@@ -28,7 +28,7 @@ function install_ui() {
   echo -e "|  4) [Fluidd]             |  9) $(obico_install_title) |"
   echo -e "|                          | 10) [OctoEverywhere]       |"
   echo -e "|                          | 11) [Mobileraker]          |"
-  echo -e "| Touchscreen GUI:         | 12) [OctoApp]              |"
+  echo -e "| Touchscreen GUI:         | 12) [OctoApp for Klipper]  |"
   echo -e "|  5) [KlipperScreen]      |                            |"
   echo -e "|                          | Webcam Streamer:           |"
   echo -e "|                          | 13) [Crowsnest]            |"