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

Double slashes (#77)

Browse Source 
* octoconfig modification

* version readme
This commit is contained in:
paukstelis
2023-04-15 21:11:41 -04:00
committed by GitHub
parent 4dc82652bb
commit 0a21375664
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -1,4 +1,4 @@
Updated April 6, 2023. Updated April 15, 2023.
Want to support this work? Buy Me a Coffee. https://www.buymeacoffee.com/ppaukstelis. Want to support this work? Buy Me a Coffee. https://www.buymeacoffee.com/ppaukstelis.
Need help with octoprint_deploy? Ask on Discord: https://discord.gg/6vgSjgvR6u Need help with octoprint_deploy? Ask on Discord: https://discord.gg/6vgSjgvR6u
# octoprint_deploy # octoprint_deploy
@@ -60,6 +60,8 @@ These files provide a bash script for quickly deploying multiple octoprint insta
* Change udev rules for an instance with `sudo octoprint_deploy/octoprint_deploy.sh replace` * Change udev rules for an instance with `sudo octoprint_deploy/octoprint_deploy.sh replace`
* Always a good idea to update octoprint_deploy from time-to-time with `git -C octoprint_deploy pull` * Always a good idea to update octoprint_deploy from time-to-time with `git -C octoprint_deploy pull`
# Recent Changes # Recent Changes
* Remove path double slashes that seemed to prevented deletion of timelapse videos.
* Check for spaces in instance name, admin user, and password
* Force camera port to be greater than 7000 * Force camera port to be greater than 7000
* Allow removal of individual camera services. Improvements to instance and camera removal. * Allow removal of individual camera services. Improvements to instance and camera removal.
* Haproxy fixed! No more trailing slash required! Running new octoprint_deploy on an older installation automatically update these entries. * Haproxy fixed! No more trailing slash required! Running new octoprint_deploy on an older installation automatically update these entries.

6
octoprint_deploy.sh
View File

@@ -121,7 +121,7 @@ new_instance () {
echo Selected port is: $PORT | log echo Selected port is: $PORT | log
OCTOUSER=$user OCTOUSER=$user
OCTOPATH=$DAEMONPATH OCTOPATH=$DAEMONPATH
OCTOCONFIG="/home/$user/" OCTOCONFIG="/home/$user"
BFOLD="/home/$user/.octoprint" BFOLD="/home/$user/.octoprint"
echo "Your OctoPrint instance will be installed at /home/$user/.$INSTANCE" echo "Your OctoPrint instance will be installed at /home/$user/.$INSTANCE"
echo echo
@@ -171,7 +171,7 @@ new_instance () {
echo "Octoprint Config Path (where the hidden instance directory will be) [/home/$user/]:" echo "Octoprint Config Path (where the hidden instance directory will be) [/home/$user/]:"
read OCTOCONFIG read OCTOCONFIG
if [ -z "$OCTOCONFIG" ]; then if [ -z "$OCTOCONFIG" ]; then
OCTOCONFIG="/home/$user/" OCTOCONFIG="/home/$user"
fi fi
#octoprint_base is the generic .octoprint folder that contains all configuration, upload, etc. #octoprint_base is the generic .octoprint folder that contains all configuration, upload, etc.
@@ -1455,7 +1455,7 @@ instance_status() {
} }
main_menu() { main_menu() {
VERSION=0.2.3 VERSION=0.2.4
#reset #reset
UDEV='' UDEV=''
TEMPUSB='' TEMPUSB=''