h3n3/kiauh
1
0
Fork 0
Code Issues 46 Pull Requests 10 Packages Projects Releases Wiki Activity

refactor(octoprint.sh): rename base_dir to basedir

Browse Source 
Signed-off-by: Dominik Willner th33xitus@gmail.com
This commit is contained in:
th33xitus
2022-04-03 23:12:09 +02:00
parent 898a6bbfd0
commit 00d63816ae
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/octoprint.sh
View File

@@ -132,7 +132,7 @@ add_to_groups(){
function create_config_yaml(){ function create_config_yaml(){
local base_dir=${1} tmp_printer=${2} restart_cmd=${3} local base_dir=${1} tmp_printer=${2} restart_cmd=${3}
/bin/sh -c "cat > ${base_dir}/config.yaml" << CONFIGYAML /bin/sh -c "cat > ${basedir}/config.yaml" << CONFIGYAML
serial: serial:
additionalPorts: additionalPorts:
- ${tmp_printer} - ${tmp_printer}
@@ -150,7 +150,7 @@ function create_single_octoprint_instance(){
local port=5000 local port=5000
local base_dir="${HOME}/.octoprint" local base_dir="${HOME}/.octoprint"
local tmp_printer="/tmp/printer" local tmp_printer="/tmp/printer"
local config_yaml="${base_dir}/config.yaml" local config_yaml="${basedir}/config.yaml"
local restart_cmd="sudo service octoprint restart" local restart_cmd="sudo service octoprint restart"
status_msg "Creating OctoPrint instance ..." status_msg "Creating OctoPrint instance ..."
@@ -165,17 +165,17 @@ Environment="LC_ALL=C.UTF-8"
Environment="LANG=C.UTF-8" Environment="LANG=C.UTF-8"
Type=simple Type=simple
User=${USER} User=${USER}
ExecStart=${OCTOPRINT_ENV}/venv/bin/octoprint --basedir ${base_dir} --config ${config_yaml} --port=${port} serve ExecStart=${OCTOPRINT_ENV}/venv/bin/octoprint --basedir ${basedir} --config ${config_yaml} --port=${port} serve
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target
OCTOPRINT OCTOPRINT
### create the config.yaml ### create the config.yaml
if [ ! -f "${base_dir}/config.yaml" ]; then if [ ! -f "${basedir}/config.yaml" ]; then
status_msg "Creating config.yaml ..." status_msg "Creating config.yaml ..."
[ ! -d "${base_dir}" ] && mkdir "${base_dir}" [ ! -d "${basedir}" ] && mkdir "${basedir}"
create_config_yaml "${base_dir}" "${tmp_printer}" "${restart_cmd}" create_config_yaml "${basedir}" "${tmp_printer}" "${restart_cmd}"
ok_msg "Config created!" ok_msg "Config created!"
fi fi
} }
@@ -186,7 +186,7 @@ function create_multi_octoprint_instance(){
### multi instance variables ### multi instance variables
local base_dir="${HOME}/.octoprint-${i}" local base_dir="${HOME}/.octoprint-${i}"
local tmp_printer="/tmp/printer-${i}" local tmp_printer="/tmp/printer-${i}"
local config_yaml="${base_dir}/config.yaml" local config_yaml="${basedir}/config.yaml"
local restart_cmd="sudo service octoprint-${i} restart" local restart_cmd="sudo service octoprint-${i} restart"
### create instance ### create instance
@@ -202,16 +202,16 @@ Environment="LC_ALL=C.UTF-8"
Environment="LANG=C.UTF-8" Environment="LANG=C.UTF-8"
Type=simple Type=simple
User=${USER} User=${USER}
ExecStart=${OCTOPRINT_ENV}/venv/bin/octoprint --basedir ${base_dir} --config ${config_yaml} --port=${port} serve ExecStart=${OCTOPRINT_ENV}/venv/bin/octoprint --basedir ${basedir} --config ${config_yaml} --port=${port} serve
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target
OCTOPRINT OCTOPRINT
### create the config.yaml ### create the config.yaml
if [ ! -f "${base_dir}/config.yaml" ]; then if [ ! -f "${basedir}/config.yaml" ]; then
status_msg "Creating config.yaml for instance #${i}..." status_msg "Creating config.yaml for instance #${i}..."
[ ! -d "${base_dir}" ] && mkdir "${base_dir}" [ ! -d "${basedir}" ] && mkdir "${basedir}"
create_config_yaml create_config_yaml
ok_msg "Config #${i} created!" ok_msg "Config #${i} created!"
fi fi