From 07af423fa30f61027ae97c28fff8e106201e0533 Mon Sep 17 00:00:00 2001
From: th33xitus <th33xitus@googlemail.com>
Date: Tue, 12 Apr 2022 19:11:15 +0200
Subject: [PATCH] fix: group `dialout` is required for klippers USB
 communication

Signed-off-by: Dominik Willner th33xitus@gmail.com
---
 scripts/flash_klipper.sh    | 14 ++++++--------
 scripts/klipper.sh          |  3 +++
 scripts/ui/advanced_menu.sh |  4 ++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/scripts/flash_klipper.sh b/scripts/flash_klipper.sh
index c9102c1..d2a29c6 100644
--- a/scripts/flash_klipper.sh
+++ b/scripts/flash_klipper.sh
@@ -289,17 +289,13 @@ function retrieve_id(){
   fi 2>/dev/null
 }
 
-function check_usergroup_dialout(){
-  local group_dialout
+function check_usergroups(){
+  local group_dialout group_tty
   if grep -q "dialout" </etc/group && ! grep -q "dialout" <(groups "${USER}"); then
     group_dialout=false
-  else
-    group_dialout=true
   fi
   if grep -q "tty" </etc/group && ! grep -q "tty" <(groups "${USER}"); then
     group_tty=false
-  else
-    group_tty=true
   fi
   if [ "${group_dialout}" == "false" ] || [ "${group_tty}" == "false" ] ; then
     top_border
@@ -308,7 +304,8 @@ function check_usergroup_dialout(){
     [ "${group_dialout}" == "false" ] && echo -e "| ${yellow}● dialout${white}                                             |"
     blank_line
     echo -e "| It is possible that you won't be able to successfully |"
-    echo -e "| flash without your user being a member of that group. |"
+    echo -e "| connect and/or flash the controller board without     |"
+    echo -e "| your user being a member of that group.               |"
     echo -e "| If you want to add the current user to the group(s)   |"
     echo -e "| listed above, answer with 'Y'. Else skip with 'n'.    |"
     blank_line
@@ -327,7 +324,8 @@ function check_usergroup_dialout(){
           if [ "${group_dialout}" == "false" ]; then
             sudo usermod -a -G dialout "${USER}" && ok_msg "Group 'dialout' assigned!"
           fi
-          ok_msg "You need to relog/restart for the group(s) to be applied!" && exit 0;;
+          ok_msg "Remember to relog/restart this machine for the group(s) to be applied!"
+          break;;
         N|n|No|no)
           select_msg "No"
           break;;
diff --git a/scripts/klipper.sh b/scripts/klipper.sh
index 3e7253f..d2e7cfc 100644
--- a/scripts/klipper.sh
+++ b/scripts/klipper.sh
@@ -145,6 +145,9 @@ function klipper_setup(){
   do_action_service "enable" "klipper"
   do_action_service "start" "klipper"
 
+  ### step 6: check for dialout group membership
+  check_usergroups
+
   ### confirm message
   if [[ ${instances} -eq 1 ]]; then
     local confirm="Klipper has been set up!"
diff --git a/scripts/ui/advanced_menu.sh b/scripts/ui/advanced_menu.sh
index a2f5bfb..00438c4 100755
--- a/scripts/ui/advanced_menu.sh
+++ b/scripts/ui/advanced_menu.sh
@@ -53,11 +53,11 @@ advanced_menu(){
         do_action "build_fw" "advanced_ui";;
       4)
         clear && print_header
-        check_usergroup_dialout
+        check_usergroups
         do_action "select_flash_method" "advanced_ui";;
       5)
         clear && print_header
-        check_usergroup_dialout
+        check_usergroups
         status_msg "Please wait..."
         build_fw && select_flash_method
         print_msg && clear_msg