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

update

Browse Source
This commit is contained in:
David Schroeder
2024-08-04 19:19:54 -05:00
parent fa148e0b3c
commit 78be1dff59
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
util.sh
View File

@@ -88,8 +88,8 @@ back_up_all() {
get_instances() {
addquit=$1
if [ -f /etc/octoprint_instances ]; then
readarray -t INSTANCE_ARR < <(cat /etc/octoprint_instances | sed -n -e 's/^instance:\([[:graph:]]*\) .*/\1/p')
if [ -f /etc/octodocker_instances ]; then
readarray -t INSTANCE_ARR < <(cat /etc/octodocker_instances | sed -n -e 's/^instance:\([[:graph:]]*\) .*/\1/p')
if [ "$addquit" == true ]; then
INSTANCE_ARR+=("Quit")
fi
@@ -191,7 +191,7 @@ share_uploads() {
add_udev() {
#get instances that don't have a udev rule
PS3="${green}Select instance to add udev rule: ${white}"
readarray -t noudev < <(fgrep "udev:false" /etc/octoprint_instances 2> /dev/null | sed -n -e 's/^instance:\([[:graph:]]*\) .*/\1/p')
readarray -t noudev < <(fgrep "udev:false" /etc/octodocker_instances 2> /dev/null | sed -n -e 's/^instance:\([[:graph:]]*\) .*/\1/p')
noudev+=("Quit")
select opt in "${noudev[@]}"
do
@@ -203,7 +203,7 @@ add_udev() {
printer_udev false
printer_udev true
#this needs more thought
sed -i "s/^\(instance:$INSTANCE port:.* udev:\)false/\1true/" /etc/octoprint_instances
sed -i "s/^\(instance:$INSTANCE port:.* udev:\)false/\1true/" /etc/octodocker_instances
break
done
udevadm control --reload-rules
@@ -214,7 +214,7 @@ add_udev() {
remove_udev() {
PS3="${green}Select udev rule to remove: ${white}"
readarray -t udevs < <(fgrep "udev:true" /etc/octoprint_instances 2> /dev/null | sed -n -e 's/^instance:\([[:graph:]]*\) .*/\1/p')
readarray -t udevs < <(fgrep "udev:true" /etc/octodocker_instances 2> /dev/null | sed -n -e 's/^instance:\([[:graph:]]*\) .*/\1/p')
udevs+=("Quit")
select opt in "${udevs[@]}"
do
@@ -222,7 +222,7 @@ remove_udev() {
main_menu
fi
sed -i "/$opt/d" /etc/udev/rules.d/99-octoprint.rules
sed -i "s/^\(instance:$opt port:.* udev:\)true/\1false/" /etc/octoprint_instances
sed -i "s/^\(instance:$opt port:.* udev:\)true/\1false/" /etc/octodocker_instances
break
done
echo "${cyan}udev rule has been removed${white}"
@@ -243,7 +243,7 @@ add_udev_camera() {
INSTANCE=$opt
detect_camera
write_cam_udev
sed -i "s/^\(camera:$opt port:.* udev:\)false/\1true/" /etc/octoprint_instances
sed -i "s/^\(camera:$opt port:.* udev:\)false/\1true/" /etc/octodocker_instances
break
done
udevadm control --reload-rules
@@ -324,7 +324,7 @@ remove_everything() {
echo "Removing system stuff"
rm /etc/octoprint_streamer 2>/dev/null
rm /etc/octodocker_deploy 2>/dev/null
rm /etc/octoprint_instances 2>/dev/null
rm /etc/octodocker_instances 2>/dev/null
rm /etc/octoprint_cameras 2>/dev/null
rm /etc/udev/rules.d/99-octoprint.rules 2>/dev/null
rm -rf /opt/octoprint/ustreamer 2>/dev/null
@@ -377,7 +377,7 @@ diagnostics() {
logfile='octodocker_deploy_diagnostic.log'
echo "octodocker_deploy diagnostic information. Please provide ALL output for support help"
diagnostic_output /etc/octodocker_deploy | log
diagnostic_output /etc/octoprint_instances | log
diagnostic_output /etc/octodocker_instances | log
diagnostic_output /etc/octoprint_cameras | log
diagnostic_output /etc/udev/rules.d/99-octoprint.rules | log
ls -la /dev/octo* | log