diff --git a/bbb-libreoffice/install.sh b/bbb-libreoffice/install.sh index e3641a05df..126a69e7a0 100755 --- a/bbb-libreoffice/install.sh +++ b/bbb-libreoffice/install.sh @@ -21,9 +21,6 @@ else echo "Docker already installed"; fi -#Uninstall old version of docker and service if exists (keep temporarily) -./uninstall-bbb-libreoffice.sh - IMAGE_CHECK=`docker image inspect bbb-soffice &> /dev/null && echo 1 || echo 0` if [ "$IMAGE_CHECK" = "0" ]; then echo "Docker image doesn't exists, building" diff --git a/bbb-libreoffice/uninstall-bbb-libreoffice.sh b/bbb-libreoffice/uninstall-bbb-libreoffice.sh deleted file mode 100755 index 991f4e36c8..0000000000 --- a/bbb-libreoffice/uninstall-bbb-libreoffice.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -set -e - -if [ "$EUID" -ne 0 ]; then - echo "Please run this script as root ( or with sudo )" ; - exit 1; -fi; - -IMAGE_CHECK=`docker image inspect bbb-libreoffice 2>&1 > /dev/null && echo 1 || echo 0` -if [ "$IMAGE_CHECK" = "1" ]; then - echo "Stopping services" - systemctl --no-pager --no-legend --value --state=running | grep bbb-libreoffice | awk -F '.service' '{print $1}' | xargs --no-run-if-empty -n 1 systemctl stop - - echo "Removing image" - docker image rm bbb-libreoffice -fi - -FOLDER_CHECK=`[ -d /usr/share/bbb-libreoffice/ ] && echo 1 || echo 0` -if [ "$FOLDER_CHECK" = "1" ]; then - echo "Stopping services" - systemctl --no-pager --no-legend --value --state=running | grep bbb-libreoffice | awk -F '.service' '{print $1}' | xargs --no-run-if-empty -n 1 systemctl stop - - echo "Removing install folder" - rm -rf /usr/share/bbb-libreoffice/ - - echo "Removing service definitions" - rm /lib/systemd/system/bbb-libreoffice@.service - find /etc/systemd/ | grep bbb-libreoffice | xargs --no-run-if-empty -n 1 -I __ rm __ - systemctl daemon-reload -fi; - -NETWORK_CHECK=`docker network inspect bbb-libreoffice &> /dev/null && echo 1 || echo 0` -if [ "$NETWORK_CHECK" = "1" ]; then - echo "Removing docker network" - docker network remove bbb-libreoffice -fi - diff --git a/bbb-libreoffice/uninstall.sh b/bbb-libreoffice/uninstall.sh index c8143ccfa6..d39ed2f797 100755 --- a/bbb-libreoffice/uninstall.sh +++ b/bbb-libreoffice/uninstall.sh @@ -7,10 +7,6 @@ if [ "$EUID" -ne 0 ]; then fi; -#Uninstall old version of docker and service if exists (keep temporarily) -./uninstall-bbb-libreoffice.sh - - IMAGE_CHECK=`docker image inspect bbb-soffice 2>&1 > /dev/null && echo 1 || echo 0` if [ "$IMAGE_CHECK" = "1" ]; then echo "Removing image"