voltron/octodocker_deploy
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Update util.sh

Browse Source
This commit is contained in:
David Schroeder
2024-08-04 15:37:12 -05:00
parent 1d135ce7a1
commit c3389ba97c
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
util.sh
View File

@@ -28,8 +28,8 @@ has-space () {
get_settings() { get_settings() {
#Get octodocker_deploy settings, all of which are written on system prepare #Get octodocker_deploy settings, all of which are written on system prepare
if [ -f /etc/octodocker_deploy ]; then if [ -f /etc/octodocker_deploy ]; then
OCTOEXEC=/usr/local/bin/octoprint #OCTOEXEC=/usr/local/bin/octoprint
OCTOPIP=/usr/local/bin/pip #OCTOPIP=/usr/local/bin/pip
STREAMER=$(cat /etc/octodocker_deploy | sed -n -e 's/^streamer: \(\.*\)/\1/p') STREAMER=$(cat /etc/octodocker_deploy | sed -n -e 's/^streamer: \(\.*\)/\1/p')
HAPROXY=$(cat /etc/octodocker_deploy | sed -n -e 's/^haproxy: \(\.*\)/\1/p') HAPROXY=$(cat /etc/octodocker_deploy | sed -n -e 's/^haproxy: \(\.*\)/\1/p')
fi fi
@@ -53,7 +53,7 @@ global_config() {
} }
octo_deploy_update() { octo_deploy_update() {
git -C $SCRIPTDIR pull git -C $SCRIPTDIR pull
exit exit
} }
@@ -61,8 +61,8 @@ back_up() {
INSTANCE=$1 INSTANCE=$1
echo "Creating backup of $INSTANCE...." echo "Creating backup of $INSTANCE...."
docker exec -it $INSTANCE $OCTOEXEC --basedir /opt/octoprint/$INSTANCE plugins backup:backup --exclude timelapse docker exec -it $INSTANCE $OCTOEXEC --basedir /opt/octoprint/$INSTANCE plugins backup:backup --exclude timelapse
mkdir /opt/octoprint/instance_backup 2>/dev/null mkdir /opt/octoprint/instance_backup 2>/dev/null
mv /opt/octoprint/$INSTANCE/data/backup/*.zip /opt/octoprint/instance_backup/ mv /opt/octoprint/$INSTANCE/data/backup/*.zip /opt/octoprint/instance_backup/
echo "Zipped instance backup created in /opt/octoprint/instance_backup" echo "Zipped instance backup created in /opt/octoprint/instance_backup"
} }
@@ -405,5 +405,5 @@ diagnostics() {
main_menu main_menu
} }
command_exists() { command -v "$@" > /dev/null 2>&1 } # command_exists() { command -v "$@" > /dev/null 2>&1 }
join_by() { local IFS="$1"; shift; echo "$*"; } # join_by() { local IFS="$1"; shift; echo "$*"; }