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

feat: KIAUH v4.0.0 #191

Merged
dw-0 merged 453 commits from v4-rc into master 2022-05-29 20:11:16 +02:00
Conversation 8 Commits 453 Files Changed 64 +16 -16
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 374f787bb7 - Show all commits

32
scripts/moonraker.sh
View File

@@ -167,22 +167,6 @@ function moonraker_setup(){
print_mr_ip_list "${instances}" print_mr_ip_list "${instances}"
} }
function write_moonraker_service(){
local i=${1} cfg_dir=${2} cfg=${3} log=${4} service=${5}
local service_template="${SRCDIR}/kiauh/resources/moonraker.service"
### replace all placeholders
if [ ! -f "${service}" ]; then
status_msg "Creating Moonraker Service ${i} ..."
sudo cp "${service_template}" "${service}"
[ -z "${i}" ] && sudo sed -i "s|instance %INST% ||" "${service}"
[ -n "${i}" ] && sudo sed -i "s|%INST%|${i}|" "${service}"
sudo sed -i "s|%USER%|${USER}|; s|%ENV%|${MOONRAKER_ENV}|; s|%DIR%|${MOONRAKER_DIR}|" "${service}"
sudo sed -i "s|%CFG%|${cfg}|; s|%LOG%|${log}|" "${service}"
fi
}
function create_moonraker_conf(){ function create_moonraker_conf(){
local lan instances=${1} log="${HOME}/klipper_logs" local lan instances=${1} log="${HOME}/klipper_logs"
lan="$(hostname -I | cut -d" " -f1 | cut -d"." -f1-2).0.0/16" lan="$(hostname -I | cut -d" " -f1 | cut -d"." -f1-2).0.0/16"
@@ -271,6 +255,22 @@ function create_moonraker_service(){
fi fi
} }
function write_moonraker_service(){
local i=${1} cfg_dir=${2} cfg=${3} log=${4} service=${5}
local service_template="${SRCDIR}/kiauh/resources/moonraker.service"
### replace all placeholders
if [ ! -f "${service}" ]; then
status_msg "Creating Moonraker Service ${i} ..."
sudo cp "${service_template}" "${service}"
[ -z "${i}" ] && sudo sed -i "s|instance %INST% ||" "${service}"
[ -n "${i}" ] && sudo sed -i "s|%INST%|${i}|" "${service}"
sudo sed -i "s|%USER%|${USER}|; s|%ENV%|${MOONRAKER_ENV}|; s|%DIR%|${MOONRAKER_DIR}|" "${service}"
sudo sed -i "s|%CFG%|${cfg}|; s|%LOG%|${log}|" "${service}"
fi
}
function print_mr_ip_list(){ function print_mr_ip_list(){
local ip instances="${1}" i=1 port=7125 local ip instances="${1}" i=1 port=7125
ip=$(hostname -I | cut -d" " -f1) ip=$(hostname -I | cut -d" " -f1)