Update util.sh
This commit is contained in:
8
util.sh
8
util.sh
@@ -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
|
||||||
@@ -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 "$*"; }
|
||||||
|
|||||||
Reference in New Issue
Block a user