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

refactor(klipper): disallow "mcu" as instance name (and case variations)

Browse Source 
Signed-off-by: Dominik Willner <th33xitus@gmail.com>
This commit is contained in:
th33xitus
2023-02-28 16:12:17 +01:00
parent 4ebe0162d6
commit f3337616f9
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/klipper.sh
View File

@@ -50,6 +50,7 @@ function start_klipper_setup() {
local use_custom_names local use_custom_names
local input local input
local regex local regex
local blacklist
local error local error
status_msg "Initializing Klipper installation ...\n" status_msg "Initializing Klipper installation ...\n"
@@ -129,15 +130,19 @@ function start_klipper_setup() {
fi fi
### user selection for setting the actual custom names ### user selection for setting the actual custom names
shopt -s nocasematch
if (( instance_count > 1 )) && [[ ${use_custom_names} == "true" ]]; then if (( instance_count > 1 )) && [[ ${use_custom_names} == "true" ]]; then
local i local i
i=1 i=1
regex="^[0-9a-zA-Z]+$" regex="^[0-9a-zA-Z]+$"
while [[ ! ${input} =~ ${regex} || ${i} -le ${instance_count} ]]; do blacklist="mcu"
while [[ ! ${input} =~ ${regex} || ${input} =~ ${blacklist} || ${i} -le ${instance_count} ]]; do
read -p "${cyan}###### Name for instance #${i}:${white} " input read -p "${cyan}###### Name for instance #${i}:${white} " input
if [[ ${input} =~ ${regex} ]]; then if [[ ${input} =~ ${blacklist} ]]; then
error_msg "Name not allowed! You are trying to use a reserved name."
elif [[ ${input} =~ ${regex} && ! ${input} =~ ${blacklist} ]]; then
select_msg "Name: ${input}\n" select_msg "Name: ${input}\n"
if [[ ${input} =~ ^[0-9]+$ ]]; then if [[ ${input} =~ ^[0-9]+$ ]]; then
instance_names+=("printer_${input}") instance_names+=("printer_${input}")
@@ -154,6 +159,7 @@ function start_klipper_setup() {
instance_names+=("printer_${i}") instance_names+=("printer_${i}")
done done
fi fi
shopt -u nocasematch
(( instance_count > 1 )) && status_msg "Installing ${instance_count} Klipper instances ..." (( instance_count > 1 )) && status_msg "Installing ${instance_count} Klipper instances ..."
(( instance_count == 1 )) && status_msg "Installing single Klipper instance ..." (( instance_count == 1 )) && status_msg "Installing single Klipper instance ..."