This commit is contained in:
Cyril 2024-05-19 22:34:26 +02:00
parent bb76f7354a
commit e6a601024c
7 changed files with 379 additions and 10 deletions

View file

@ -183,9 +183,7 @@ function install_menu_3v3() {
run "install_octoeverywhere" "install_menu_ui_3v3"
fi;;
17)
if [ -d "$MOONRAKER_OBICO_FOLDER" ]; then
error_msg "Moonraker Obico is already installed!"
elif [ ! -d "$MOONRAKER_FOLDER" ]; then
if [ ! -d "$MOONRAKER_FOLDER" ]; then
error_msg "Updated Moonraker is needed, please install it first!"
elif [ ! -d "$FLUIDD_FOLDER" ] && [ ! -d "$MAINSAIL_FOLDER" ]; then
error_msg "Updated Fluidd or Mainsail is needed, please install one of them first!"

View file

@ -202,9 +202,7 @@ function install_menu_k1() {
run "install_octoeverywhere" "install_menu_ui_k1"
fi;;
20)
if [ -d "$MOONRAKER_OBICO_FOLDER" ]; then
error_msg "Moonraker Obico is already installed!"
elif [ ! -d "$MOONRAKER_FOLDER" ]; then
if [ ! -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 one of them first!"

View file

@ -151,9 +151,7 @@ function install_menu_ke() {
run "install_octoeverywhere" "install_menu_ui_ke"
fi;;
13)
if [ -d "$MOONRAKER_OBICO_FOLDER" ]; then
error_msg "Moonraker Obico is already installed!"
elif [ ! -d "$MOONRAKER_FOLDER" ]; then
if [ ! -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 one of them first!"

View file

@ -24,6 +24,9 @@ function install_mobileraker_companion(){
echo -e "Info: Downloading Mobileraker Companion..."
git config --global http.sslVerify false
git clone "$MOBILERAKER_COMPANION_URL" "$MOBILERAKER_COMPANION_FOLDER"
rm -f "$MOBILERAKER_COMPANION_FOLDER"/scripts/install.sh
cp "${HS_FILES}"/fixes/install-mobileraker.sh "$MOBILERAKER_COMPANION_FOLDER"/scripts/install.sh
chmod 755 "$MOBILERAKER_COMPANION_FOLDER"/scripts/install.sh
echo -e "Info: Running Mobileraker Companion installer..."
sh "$MOBILERAKER_COMPANION_FOLDER"/scripts/install.sh
echo

View file

@ -68,7 +68,7 @@ function remove_moonraker_obico(){
rm -rf /usr/data/moonraker-obico-env
rm -f "$KLIPPER_CONFIG_FOLDER"/moonraker-obico-update.cfg
rm -f "$KLIPPER_CONFIG_FOLDER"/config/moonraker-obico.cfg
rm -f /etc/init.d/S99moonraker_obico
rm -f "$INITD_FOLDER"/S99moonraker_obico
echo -e "Info: Restarting Moonraker service..."
stop_moonraker
start_moonraker

View file

@ -54,6 +54,9 @@ function remove_octoeverywhere(){
echo -e "Info: Running OctoEverywhere uninstaller..."
cd "$OCTOEVERYWHERE_FOLDER"
sh ./uninstall.sh
if [ -f /root/update-octoeverywhere.sh ]; then
rm -f /root/update-octoeverywhere.sh
fi
ok_msg "OctoEverywhere has been removed successfully!"
return;;
N|n)