voltron/octodocker_deploy
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Spacecheck (#76)

Browse Source 
* has-space function

* quotes for arguments passed to function
This commit is contained in:
paukstelis
2023-04-07 16:11:40 -04:00
committed by GitHub
parent 81d7a43ab2
commit 4dc82652bb
1 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
octoprint_deploy.sh
View File

@@ -63,6 +63,11 @@ log () {
fi | tee -a "$logfile" fi | tee -a "$logfile"
} }
#https://gist.github.com/wellsie/56a468a1d53527fec827
has-space () {
[[ "$1" != "${1%[[:space:]]*}" ]] && return 0 || return 1
}
new_instance () { new_instance () {
echo "$(date) starting instance installation" | log echo "$(date) starting instance installation" | log
@@ -87,12 +92,20 @@ new_instance () {
DAEMONPATH=$BUDEFAULT DAEMONPATH=$BUDEFAULT
fi fi
echo "Enter the name for new printer/instance (no spaces):" while true; do
read INSTANCE echo "Enter the name for new printer/instance (no spaces):"
if [ -z "$INSTANCE" ]; then read INSTANCE
echo "No instance given. Exiting" | log if [ -z "$INSTANCE" ]; then
main_menu echo "No instance given. Exiting" | log
fi main_menu
fi
if ! has-space "$INSTANCE"; then
break
else
echo "Instance names must not have spaces"
fi
done
if test -f "/etc/systemd/system/$INSTANCE.service"; then if test -f "/etc/systemd/system/$INSTANCE.service"; then
echo "Already have an entry for $INSTANCE. Exiting." | log echo "Already have an entry for $INSTANCE. Exiting." | log
@@ -396,9 +409,9 @@ write_camera() {
http-request replace-path /cam${INUM}_$INSTANCE/(.*) /|\1\n\ http-request replace-path /cam${INUM}_$INSTANCE/(.*) /|\1\n\
server webcam1 127.0.0.1:$CAMPORT" server webcam1 127.0.0.1:$CAMPORT"
else else
EXTRACAM="backend cam${INUM}_$INSTANCE\n\ EXTRACAM="backend cam${INUM}_$INSTANCE\n\
reqrep ^([^|\ :]*)|\ /cam${INUM}_$INSTANCE/(.*) |\1|\ /|\2 \n\ reqrep ^([^|\ :]*)|\ /cam${INUM}_$INSTANCE/(.*) |\1|\ /|\2 \n\
server webcam1 127.0.0.1:$CAMPORT" server webcam1 127.0.0.1:$CAMPORT"
fi fi
echo "#cam${INUM}_$INSTANCE start" >> /etc/haproxy/haproxy.cfg echo "#cam${INUM}_$INSTANCE start" >> /etc/haproxy/haproxy.cfg
@@ -949,21 +962,39 @@ firstrun() {
echo echo
echo echo
if prompt_confirm "Do you want to setup your admin user now?"; then if prompt_confirm "Do you want to setup your admin user now?"; then
while true; do
echo 'Enter admin user name (no spaces): ' echo 'Enter admin user name (no spaces): '
read OCTOADMIN read OCTOADMIN
if [ -z "$OCTOADMIN" ]; then if [ -z "$OCTOADMIN" ]; then
echo -e "No admin user given! Defaulting to: \033[0;31moctoadmin\033[0m" echo -e "No admin user given! Defaulting to: \033[0;31moctoadmin\033[0m"
OCTOADMIN=octoadmin OCTOADMIN=octoadmin
fi fi
if ! has-space "$OCTOADMIN"; then
break
else
echo "Admin user name must not have spaces."
fi
done
echo "Admin user: $OCTOADMIN" echo "Admin user: $OCTOADMIN"
while true; do
echo 'Enter admin user password (no spaces): ' echo 'Enter admin user password (no spaces): '
read OCTOPASS read OCTOPASS
if [ -z "$OCTOPASS" ]; then if [ -z "$OCTOPASS" ]; then
echo -e "No password given! Defaulting to: \033[0;31mfooselrulz\033[0m. Please CHANGE this." echo -e "No password given! Defaulting to: \033[0;31mfooselrulz\033[0m. Please CHANGE this."
OCTOPASS=fooselrulz OCTOPASS=fooselrulz
fi fi
if ! has-space "$OCTOPASS"; then
break
else
echo "Admin password cannot contain spaces"
fi
done
echo "Admin password: $OCTOPASS" echo "Admin password: $OCTOPASS"
$OCTOEXEC user add $OCTOADMIN --password $OCTOPASS --admin | log $OCTOEXEC user add $OCTOADMIN --password $OCTOPASS --admin | log
fi fi
if [ -n "$OCTOADMIN" ]; then if [ -n "$OCTOADMIN" ]; then
echo echo