Update
This commit is contained in:
parent
ef2bd340ae
commit
99379f11dd
10 changed files with 76 additions and 68 deletions
|
@ -4,12 +4,12 @@ MoonCord
|
|||
KlipperScreen
|
||||
moonraker-telegram-bot
|
||||
moonraker-obico
|
||||
octoapp
|
||||
sonar
|
||||
crowsnest
|
||||
octoeverywhere
|
||||
ratos-configurator
|
||||
mobileraker
|
||||
octoapp
|
||||
guppyscreen
|
||||
guppyflo
|
||||
Git-Backup
|
|
@ -46,9 +46,9 @@ function info_menu_ui_ke() {
|
|||
subtitle '•REMOTE ACCESS AND AI DETECTION:'
|
||||
info_line "$(check_folder_ke "$OCTOEVERYWHERE_FOLDER")" 'OctoEverywhere'
|
||||
info_line "$(check_folder_ke "$MOONRAKER_OBICO_FOLDER")" 'Obico'
|
||||
info_line "$(check_folder_ke "$MOBILERAKER_COMPANION_FOLDER")" 'Mobileraker Companion'
|
||||
info_line "$(check_folder_ke "$GUPPYFLO_FOLDER")" 'GuppyFLO'
|
||||
info_line "$(check_folder_ke "$OCTOAPP_FOLDER")" 'OctoApp Companion'
|
||||
info_line "$(check_folder_ke "$MOBILERAKER_COMPANION_FOLDER")" 'Mobileraker Companion'
|
||||
info_line "$(check_folder_ke "$OCTOAPP_COMPANION_FOLDER")" 'OctoApp Companion'
|
||||
hr
|
||||
subtitle '•CUSTOMIZATION:'
|
||||
info_line "$(check_file_ke "$CREALITY_WEB_FILE")" 'Creality Web Interface'
|
||||
|
|
|
@ -28,8 +28,8 @@ function install_menu_ui_ke() {
|
|||
subtitle '•REMOTE ACCESS AND AI DETECTION:'
|
||||
menu_option '11' 'Install' 'OctoEverywhere'
|
||||
menu_option '12' 'Install' 'Moonraker Obico'
|
||||
menu_option '13' 'Install' 'Mobileraker Companion'
|
||||
menu_option '14' 'Install' 'GuppyFLO'
|
||||
menu_option '13' 'Install' 'GuppyFLO'
|
||||
menu_option '14' 'Install' 'Mobileraker Companion'
|
||||
menu_option '15' 'Install' 'OctoApp Companion'
|
||||
hr
|
||||
inner_line
|
||||
|
@ -147,19 +147,23 @@ function install_menu_ke() {
|
|||
run "install_moonraker_obico" "install_menu_ui_ke"
|
||||
fi;;
|
||||
13)
|
||||
if [ -d "$MOBILERAKER_COMPANION_FOLDER" ]; then
|
||||
error_msg "Mobileraker Companion is already installed!"
|
||||
else
|
||||
run "install_mobileraker_companion" "install_menu_ui_ke"
|
||||
fi;;
|
||||
14)
|
||||
if [ ! -d "$MOONRAKER_FOLDER" ] && [ ! -d "$NGINX_FOLDER" ]; then
|
||||
error_msg "Moonraker and Nginx are needed, please install them first!"
|
||||
else
|
||||
run "install_guppyflo" "install_menu_ui_ke"
|
||||
fi;;
|
||||
14)
|
||||
if [ -d "$MOBILERAKER_COMPANION_FOLDER" ]; then
|
||||
error_msg "Mobileraker Companion is already installed!"
|
||||
elif [ ! -d "$MOONRAKER_FOLDER" ]; then
|
||||
error_msg "Moonraker and Nginx are needed, please install them first!"
|
||||
elif [ ! -d "$FLUIDD_FOLDER" ] && [ ! -d "$MAINSAIL_FOLDER" ]; then
|
||||
error_msg "Fluidd or Mainsail is needed, please install it first!"
|
||||
else
|
||||
run "install_mobileraker_companion" "install_menu_ui_ke"
|
||||
fi;;
|
||||
15)
|
||||
if [ -d "$OCTOAPP_FOLDER" ]; then
|
||||
if [ -d "$OCTOAPP_COMPANION_FOLDER" ]; then
|
||||
error_msg "OctoApp Companion is already installed!"
|
||||
elif [ ! -d "$MOONRAKER_FOLDER" ]; then
|
||||
error_msg "Moonraker and Nginx are needed, please install them first!"
|
||||
|
@ -168,7 +172,7 @@ function install_menu_ke() {
|
|||
elif [ ! -f "$ENTWARE_FILE" ]; then
|
||||
error_msg "Entware is needed, please install it first!"
|
||||
else
|
||||
run "install_octoapp" "install_menu_ui_ke"
|
||||
run "install_octoapp_companion" "install_menu_ui_ke"
|
||||
fi;;
|
||||
B|b)
|
||||
clear; main_menu; break;;
|
||||
|
|
|
@ -28,8 +28,8 @@ function remove_menu_ui_ke() {
|
|||
subtitle '•REMOTE ACCESS AND AI DETECTION:'
|
||||
menu_option '11' 'Remove' 'OctoEverywhere'
|
||||
menu_option '12' 'Remove' 'Moonraker Obico'
|
||||
menu_option '13' 'Remove' 'Mobileraker Companion'
|
||||
menu_option '14' 'Remove' 'GuppyFLO'
|
||||
menu_option '13' 'Remove' 'GuppyFLO'
|
||||
menu_option '14' 'Remove' 'Mobileraker Companion'
|
||||
menu_option '15' 'Remove' 'OctoApp Companion'
|
||||
hr
|
||||
inner_line
|
||||
|
@ -143,22 +143,22 @@ function remove_menu_ke() {
|
|||
run "remove_moonraker_obico" "remove_menu_ui_ke"
|
||||
fi;;
|
||||
13)
|
||||
if [ ! -d "$MOBILERAKER_COMPANION_FOLDER" ]; then
|
||||
error_msg "Mobileraker Companion is not installed!"
|
||||
else
|
||||
run "remove_mobileraker_companion" "remove_menu_ui_ke"
|
||||
fi;;
|
||||
14)
|
||||
if [ ! -d "$GUPPYFLO_FOLDER" ]; then
|
||||
error_msg "GuppyFLO is not installed!"
|
||||
else
|
||||
run "remove_guppyflo" "remove_menu_ui_ke"
|
||||
fi;;
|
||||
14)
|
||||
if [ ! -d "$MOBILERAKER_COMPANION_FOLDER" ]; then
|
||||
error_msg "Mobileraker Companion is not installed!"
|
||||
else
|
||||
run "remove_mobileraker_companion" "remove_menu_ui_ke"
|
||||
fi;;
|
||||
15)
|
||||
if [ ! -d "$OCTOAPP_FOLDER" ]; then
|
||||
if [ ! -d "$OCTOAPP_COMPANION_FOLDER" ]; then
|
||||
error_msg "OctoApp Companion is not installed!"
|
||||
else
|
||||
run "remove_octoapp" "remove_menu_ui_ke"
|
||||
run "remove_octoapp_companion" "remove_menu_ui_ke"
|
||||
fi;;
|
||||
B|b)
|
||||
clear; main_menu; break;;
|
||||
|
|
|
@ -54,9 +54,9 @@ function info_menu_ui() {
|
|||
subtitle '•REMOTE ACCESS AND AI DETECTION:'
|
||||
info_line "$(check_folder "$OCTOEVERYWHERE_FOLDER")" 'OctoEverywhere'
|
||||
info_line "$(check_folder "$MOONRAKER_OBICO_FOLDER")" 'Obico'
|
||||
info_line "$(check_folder "$MOBILERAKER_COMPANION_FOLDER")" 'Mobileraker Companion'
|
||||
info_line "$(check_folder "$GUPPYFLO_FOLDER")" 'GuppyFLO'
|
||||
info_line "$(check_folder "$OCTOAPP_FOLDER")" 'OctoApp Companion'
|
||||
info_line "$(check_folder "$MOBILERAKER_COMPANION_FOLDER")" 'Mobileraker Companion'
|
||||
info_line "$(check_folder "$OCTOAPP_COMPANION_FOLDER")" 'OctoApp Companion'
|
||||
hr
|
||||
subtitle '•CUSTOMIZATION:'
|
||||
info_line "$(check_file "$BOOT_DISPLAY_FILE")" 'Custom Boot Display'
|
||||
|
|
|
@ -36,8 +36,8 @@ function install_menu_ui() {
|
|||
subtitle '•REMOTE ACCESS AND AI DETECTION:'
|
||||
menu_option '19' 'Install' 'OctoEverywhere'
|
||||
menu_option '20' 'Install' 'Moonraker Obico'
|
||||
menu_option '21' 'Install' 'Mobileraker Companion'
|
||||
menu_option '22' 'Install' 'GuppyFLO'
|
||||
menu_option '21' 'Install' 'GuppyFLO'
|
||||
menu_option '22' 'Install' 'Mobileraker Companion'
|
||||
menu_option '23' 'Install' 'OctoApp Companion'
|
||||
hr
|
||||
inner_line
|
||||
|
@ -213,19 +213,23 @@ function install_menu() {
|
|||
run "install_moonraker_obico" "install_menu_ui"
|
||||
fi;;
|
||||
21)
|
||||
if [ -d "$MOBILERAKER_COMPANION_FOLDER" ]; then
|
||||
error_msg "Mobileraker Companion is already installed!"
|
||||
else
|
||||
run "install_mobileraker_companion" "install_menu_ui"
|
||||
fi;;
|
||||
22)
|
||||
if [ ! -d "$MOONRAKER_FOLDER" ] && [ ! -d "$NGINX_FOLDER" ]; then
|
||||
error_msg "Moonraker and Nginx are needed, please install them first!"
|
||||
else
|
||||
run "install_guppyflo" "install_menu_ui"
|
||||
fi;;
|
||||
22)
|
||||
if [ -d "$MOBILERAKER_COMPANION_FOLDER" ]; then
|
||||
error_msg "Mobileraker Companion is already installed!"
|
||||
elif [ ! -d "$MOONRAKER_FOLDER" ]; then
|
||||
error_msg "Moonraker and Nginx are needed, please install them first!"
|
||||
elif [ ! -d "$FLUIDD_FOLDER" ] && [ ! -d "$MAINSAIL_FOLDER" ]; then
|
||||
error_msg "Fluidd or Mainsail is needed, please install it first!"
|
||||
else
|
||||
run "install_mobileraker_companion" "install_menu_ui"
|
||||
fi;;
|
||||
23)
|
||||
if [ -d "$OCTOAPP__FOLDER" ]; then
|
||||
if [ -d "$OCTOAPP_COMPANION_FOLDER" ]; then
|
||||
error_msg "OctoApp Companion is already installed!"
|
||||
elif [ ! -d "$MOONRAKER_FOLDER" ]; then
|
||||
error_msg "Moonraker and Nginx are needed, please install them first!"
|
||||
|
@ -234,7 +238,7 @@ function install_menu() {
|
|||
elif [ ! -f "$ENTWARE_FILE" ]; then
|
||||
error_msg "Entware is needed, please install it first!"
|
||||
else
|
||||
run "install_octoapp" "install_menu_ui"
|
||||
run "install_octoapp_companion" "install_menu_ui"
|
||||
fi;;
|
||||
B|b)
|
||||
clear; main_menu; break;;
|
||||
|
|
|
@ -36,8 +36,8 @@ function remove_menu_ui() {
|
|||
subtitle '•REMOTE ACCESS AND AI DETECTION:'
|
||||
menu_option '19' 'Remove' 'OctoEverywhere'
|
||||
menu_option '20' 'Remove' 'Moonraker Obico'
|
||||
menu_option '21' 'Remove' 'Mobileraker Companion'
|
||||
menu_option '22' 'Remove' 'GuppyFLO'
|
||||
menu_option '21' 'Remove' 'GuppyFLO'
|
||||
menu_option '22' 'Remove' 'Mobileraker Companion'
|
||||
menu_option '23' 'Remove' 'OctoApp Companion'
|
||||
hr
|
||||
inner_line
|
||||
|
@ -205,22 +205,22 @@ function remove_menu() {
|
|||
run "remove_moonraker_obico" "remove_menu_ui"
|
||||
fi;;
|
||||
21)
|
||||
if [ ! -d "$MOBILERAKER_COMPANION_FOLDER" ]; then
|
||||
error_msg "Mobileraker Companion is not installed!"
|
||||
else
|
||||
run "remove_mobileraker_companion" "remove_menu_ui"
|
||||
fi;;
|
||||
22)
|
||||
if [ ! -d "$GUPPYFLO_FOLDER" ]; then
|
||||
error_msg "GuppyFLO is not installed!"
|
||||
else
|
||||
run "remove_guppyflo" "remove_menu_ui"
|
||||
fi;;
|
||||
19)
|
||||
if [ ! -d "$OCTOAPP_FOLDER" ]; then
|
||||
22)
|
||||
if [ ! -d "$MOBILERAKER_COMPANION_FOLDER" ]; then
|
||||
error_msg "Mobileraker Companion is not installed!"
|
||||
else
|
||||
run "remove_mobileraker_companion" "remove_menu_ui"
|
||||
fi;;
|
||||
23)
|
||||
if [ ! -d "$OCTOAPP_COMPANION_FOLDER" ]; then
|
||||
error_msg "OctoApp Companion is not installed!"
|
||||
else
|
||||
run "remove_octoapp" "remove_menu_ui"
|
||||
run "remove_octoapp_companion" "remove_menu_ui"
|
||||
fi;;
|
||||
B|b)
|
||||
clear; main_menu; break;;
|
||||
|
|
|
@ -2,34 +2,34 @@
|
|||
|
||||
set -e
|
||||
|
||||
function octoapp_message(){
|
||||
function octoapp_companion_message(){
|
||||
top_line
|
||||
title 'OctoApp Companion' "${yellow}"
|
||||
inner_line
|
||||
hr
|
||||
echo -e " │ ${cyan}Control your Creality printer from your phone and ${white}│"
|
||||
echo -e " │ ${cyan}get notifications for your print! ${white}│"
|
||||
echo -e " │ ${cyan}OctoApp Companion allows you to control your printer from ${white}│"
|
||||
echo -e " │ ${cyan}OctoApp and get notifications for your prints. ${white}│"
|
||||
hr
|
||||
bottom_line
|
||||
}
|
||||
|
||||
function install_octoapp(){
|
||||
octoapp_message
|
||||
function install_octoapp_companion(){
|
||||
octoapp_companion_message
|
||||
local yn
|
||||
while true; do
|
||||
install_msg "OctoApp Companion" yn
|
||||
case "${yn}" in
|
||||
Y|y)
|
||||
echo -e "${white}"
|
||||
if [ -d "$OCTOAPP_FOLDER" ]; then
|
||||
if [ -d "$OCTOAPP_COMPANION_FOLDER" ]; then
|
||||
echo -e "Info: OctoApp Companion is already installed. Download skipped."
|
||||
else
|
||||
echo -e "Info: Downloading OctoApp Companion..."
|
||||
git config --global http.sslVerify false
|
||||
git clone "$OCTOAPP_URL" "$OCTOAPP_FOLDER"
|
||||
git clone "$OCTOAPP_URL" "$OCTOAPP_COMPANION_FOLDER"
|
||||
fi
|
||||
echo -e "Info: Running OctoApp Companion installer..."
|
||||
cd "$OCTOAPP_FOLDER"
|
||||
cd "$OCTOAPP_COMPANION_FOLDER"
|
||||
sh ./install.sh
|
||||
ok_msg "OctoApp Companion has been installed successfully!"
|
||||
return;;
|
||||
|
@ -42,17 +42,17 @@ function install_octoapp(){
|
|||
done
|
||||
}
|
||||
|
||||
function remove_octoapp(){
|
||||
octoapp_message
|
||||
function remove_octoapp_companion(){
|
||||
octoapp_companion_message
|
||||
local yn
|
||||
while true; do
|
||||
remove_msg "OctoApp Companion" yn
|
||||
case "${yn}" in
|
||||
Y|y)
|
||||
echo -e "${white}"
|
||||
echo -e "Info: Running OctoApp Companion installer..."
|
||||
cd "$OCTOAPP_FOLDER"
|
||||
sh ./uninstall.sh
|
||||
echo -e "Info: Running OctoApp Companion uninstaller..."
|
||||
cd "$OCTOAPP_COMPANION_FOLDER"
|
||||
sh ./uninstall.sh
|
||||
ok_msg "OctoApp Companion has been removed successfully!"
|
||||
return;;
|
||||
N|n)
|
||||
|
|
|
@ -51,7 +51,7 @@ function remove_octoeverywhere(){
|
|||
case "${yn}" in
|
||||
Y|y)
|
||||
echo -e "${white}"
|
||||
echo -e "Info: Running OctoEverywhere installer..."
|
||||
echo -e "Info: Running OctoEverywhere uninstaller..."
|
||||
cd "$OCTOEVERYWHERE_FOLDER"
|
||||
sh ./uninstall.sh
|
||||
ok_msg "OctoEverywhere has been removed successfully!"
|
||||
|
|
|
@ -139,13 +139,17 @@ function set_paths() {
|
|||
MOONRAKER_OBICO_FOLDER="${USR_DATA}/moonraker-obico"
|
||||
MOONRAKER_OBICO_URL="https://github.com/TheSpaghettiDetective/moonraker-obico.git"
|
||||
|
||||
# Mobileraker Companion #
|
||||
MOBILERAKER_COMPANION_FOLDER="${USR_DATA}/mobileraker_companion"
|
||||
MOBILERAKER_COMPANION_URL="https://github.com/Clon1998/mobileraker_companion.git"
|
||||
|
||||
# GuppyFLO #
|
||||
GUPPYFLO_FOLDER="${USR_DATA}/guppyflo"
|
||||
GUPPYFLO_URL="https://github.com/ballaswag/guppyflo/releases/latest/download/guppyflo_mipsle.zip"
|
||||
|
||||
# Mobileraker Companion #
|
||||
MOBILERAKER_COMPANION_FOLDER="${USR_DATA}/mobileraker_companion"
|
||||
MOBILERAKER_COMPANION_URL="https://github.com/Clon1998/mobileraker_companion.git"
|
||||
|
||||
# OctoApp Companion #
|
||||
OCTOAPP_COMPANION_FOLDER="${USR_DATA}/octoapp"
|
||||
OCTOAPP_COMPANION_URL="https://github.com/crysxd/OctoApp-Plugin.git"
|
||||
|
||||
# Custom Boot Display #
|
||||
BOOT_DISPLAY_FOLDER="/etc/boot-display"
|
||||
|
@ -161,10 +165,6 @@ function set_paths() {
|
|||
GUPPY_SCREEN_FOLDER="${USR_DATA}/guppyscreen"
|
||||
GUPPY_SCREEN_URL1="${HS_FILES}/guppy-screen/guppy_update.cfg"
|
||||
GUPPY_SCREEN_URL2="${HS_FILES}/guppy-screen/guppy-update.sh"
|
||||
|
||||
# OctoApp Companion #
|
||||
OCTOAPP_FOLDER="${USR_DATA}/octoapp"
|
||||
OCTOAPP_URL="https://github.com/crysxd/OctoApp-Plugin.git"
|
||||
|
||||
# Creality Dynamic Logos for Fluidd #
|
||||
FLUIDD_LOGO_FILE="${USR_DATA}/fluidd/logo_creality_v2.svg"
|
||||
|
|
Loading…
Add table
Reference in a new issue