From c3389ba97cffa9e3c271b863a67e10ac21615534 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 4 Aug 2024 15:37:12 -0500 Subject: [PATCH] Update util.sh --- util.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/util.sh b/util.sh index 84e0207..29dfa67 100755 --- a/util.sh +++ b/util.sh @@ -28,8 +28,8 @@ has-space () { get_settings() { #Get octodocker_deploy settings, all of which are written on system prepare if [ -f /etc/octodocker_deploy ]; then - OCTOEXEC=/usr/local/bin/octoprint - OCTOPIP=/usr/local/bin/pip + #OCTOEXEC=/usr/local/bin/octoprint + #OCTOPIP=/usr/local/bin/pip STREAMER=$(cat /etc/octodocker_deploy | sed -n -e 's/^streamer: \(\.*\)/\1/p') HAPROXY=$(cat /etc/octodocker_deploy | sed -n -e 's/^haproxy: \(\.*\)/\1/p') fi @@ -53,7 +53,7 @@ global_config() { } octo_deploy_update() { - git -C $SCRIPTDIR pull + git -C $SCRIPTDIR pull exit } @@ -61,8 +61,8 @@ back_up() { INSTANCE=$1 echo "Creating backup of $INSTANCE...." docker exec -it $INSTANCE $OCTOEXEC --basedir /opt/octoprint/$INSTANCE plugins backup:backup --exclude timelapse - mkdir /opt/octoprint/instance_backup 2>/dev/null - mv /opt/octoprint/$INSTANCE/data/backup/*.zip /opt/octoprint/instance_backup/ + mkdir /opt/octoprint/instance_backup 2>/dev/null + mv /opt/octoprint/$INSTANCE/data/backup/*.zip /opt/octoprint/instance_backup/ echo "Zipped instance backup created in /opt/octoprint/instance_backup" } @@ -405,5 +405,5 @@ diagnostics() { main_menu } -command_exists() { command -v "$@" > /dev/null 2>&1 } -join_by() { local IFS="$1"; shift; echo "$*"; } +# command_exists() { command -v "$@" > /dev/null 2>&1 } +# join_by() { local IFS="$1"; shift; echo "$*"; }