diff --git a/opsi/backend/upgrade.sh b/opsi/backend/upgrade.sh deleted file mode 100755 index d1f2d7c..0000000 --- a/opsi/backend/upgrade.sh +++ /dev/null @@ -1,16 +0,0 @@ -# wait for opensight to close before running script -echo "Waiting for Opensight to exit..." -while ps aux | grep opensight | grep [p]ython; do sleep 1; done -echo "Starting upgrade." -# force overwrite for stdeb -dpkg --force-overwrite -Ri "$1/deps" -apt-mark auto -for file in "$1/deps/"*; do - name="$(dpkg -I $file | grep -m1 Package | cut -d ' ' -f3)" - echo "Marking $name as auto" - apt-mark auto "$name" -done -apt-mark manual "opensight" -dpkg --skip-same-version -Ri "$1/system-deps" -apt-get -y autoremove -reboot diff --git a/opsi/lifespan/lifespan.py b/opsi/lifespan/lifespan.py index e1df83d..952e99f 100644 --- a/opsi/lifespan/lifespan.py +++ b/opsi/lifespan/lifespan.py @@ -1,8 +1,8 @@ import logging +import os import signal import subprocess import threading -import os from os.path import isdir, isfile, splitext import opsi diff --git a/opsi/modules/videoio/cameraserver.py b/opsi/modules/videoio/cameraserver.py index feb813e..00e8003 100644 --- a/opsi/modules/videoio/cameraserver.py +++ b/opsi/modules/videoio/cameraserver.py @@ -9,7 +9,6 @@ import opsi.manager.cvwrapper as cvw from opsi.manager.manager_schema import Hook - from opsi.util.concurrency import AsyncThread, Snippet from opsi.util.templating import LiteralTemplate