From e34b452bab1e07837b5bf7d6b270bd94b932cbc3 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Fri, 3 Apr 2020 13:31:53 +0200 Subject: [PATCH] setup: only run usermod if $USER is available This always triggered an error when using in docker as root. --- Tools/setup/arch.sh | 6 ++++-- Tools/setup/ubuntu.sh | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Tools/setup/arch.sh b/Tools/setup/arch.sh index fd1f898237..e4084dc05b 100644 --- a/Tools/setup/arch.sh +++ b/Tools/setup/arch.sh @@ -81,8 +81,10 @@ if [[ $INSTALL_NUTTX == "true" ]]; then vim \ ; - # add user to uucp group (to get serial port access) - sudo usermod -aG uucp $USER + if [ ! -z "$USER" ]; then + # add user to dialout group (serial port access) + sudo usermod -aG uucp $USER + fi # remove modem manager (interferes with PX4 serial port usage) sudo pacman -R modemmanager --noconfirm diff --git a/Tools/setup/ubuntu.sh b/Tools/setup/ubuntu.sh index e25861b8d0..83e848ebb0 100755 --- a/Tools/setup/ubuntu.sh +++ b/Tools/setup/ubuntu.sh @@ -131,8 +131,10 @@ if [[ $INSTALL_NUTTX == "true" ]]; then vim-common \ ; - # add user to dialout group (serial port access) - sudo usermod -a -G dialout $USER + if [ ! -z "$USER" ]; then + # add user to dialout group (serial port access) + sudo usermod -a -G dialout $USER + fi # Remove modem manager (interferes with PX4 serial port/USB serial usage). sudo apt-get remove modemmanager -y