Avoid duplicate printer names
This commit is contained in:
parent
874e9d0871
commit
6d046cd394
22
setup.sh
22
setup.sh
@ -1,10 +1,8 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# TODO: Add Crowsnest Support
|
# TODO: Add Crowsnest Support
|
||||||
# TODO: Avoid duplicate printer names
|
|
||||||
# TODO: Dry run
|
# TODO: Dry run
|
||||||
# TODO: Printer Directory Page in NGINX
|
# TODO: Printer Directory Page in NGINX
|
||||||
# TODO: Fix PolicyKit issues "klippy_uds_address"
|
|
||||||
|
|
||||||
# Handle arguments
|
# Handle arguments
|
||||||
ARG_HELP=0
|
ARG_HELP=0
|
||||||
@ -53,6 +51,14 @@ if [[ "$ARG_HELP" == 1 ]]; then
|
|||||||
echo.Rainbow "-p/--port Specify printer port (skips popup)"
|
echo.Rainbow "-p/--port Specify printer port (skips popup)"
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ "$ARG_NAME" != 0 ]]; then
|
||||||
|
if [ -d $HOME/$ARG_NAME ]; then
|
||||||
|
echo.Red "UNABLE TO COMPLY: Printer name already exists"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# Pull Klipper
|
# Pull Klipper
|
||||||
git submodule update --init --recursive
|
git submodule update --init --recursive
|
||||||
|
|
||||||
@ -70,11 +76,21 @@ fi
|
|||||||
PRINTER_NAME=""
|
PRINTER_NAME=""
|
||||||
if [[ "$ARG_NAME" == 0 ]]; then
|
if [[ "$ARG_NAME" == 0 ]]; then
|
||||||
NAME_NOT_VALID=true
|
NAME_NOT_VALID=true
|
||||||
|
DISPLAY_MSG="Name This Printer"
|
||||||
while $NAME_NOT_VALID ; do
|
while $NAME_NOT_VALID ; do
|
||||||
PRINTER_NAME=$(dialog --backtitle 'drwho@hackers.town' --inputbox 'Name This Printer' 8 40 "${PRINTER_NAME}" 3>&1 1>&2 2>&3)
|
PRINTER_NAME=$(dialog --backtitle 'drwho@hackers.town' --inputbox "$DISPLAY_MSG" 8 40 "${PRINTER_NAME}" 3>&1 1>&2 2>&3)
|
||||||
if [[ $PRINTER_NAME =~ ^[a-zA-Z0-9_-]+$ ]]; then
|
if [[ $PRINTER_NAME =~ ^[a-zA-Z0-9_-]+$ ]]; then
|
||||||
NAME_NOT_VALID=false
|
NAME_NOT_VALID=false
|
||||||
fi
|
fi
|
||||||
|
if [ -d $HOME/$PRINTER_NAME ]; then
|
||||||
|
DISPLAY_MSG="Printer name already exists"
|
||||||
|
NAME_NOT_VALID=true
|
||||||
|
fi
|
||||||
|
if [[ "$PRINTER_NAME" == "" ]]; then
|
||||||
|
echo ""
|
||||||
|
echo.Yellow "Cancelled or no input, closing script"
|
||||||
|
exit 4
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
else
|
else
|
||||||
echo.ICyan "Using passed printer name: $ARG_NAME"
|
echo.ICyan "Using passed printer name: $ARG_NAME"
|
||||||
|
Loading…
Reference in New Issue
Block a user