Switch first-time-setup to skip pipenv. Old pipenv setup is deprecated to tools directory as an optional path

Author: jkonish

first-time-setup.sh

@@ -1,60 +1,9 @@
 #!/bin/bash
 
-sudo apt-get update -y
-
-sudo apt-get install -y make \
-build-essential \
-llvm \
-libssl-dev \
-bzip2 \
-zlib1g-dev \
-libbz2-dev \
-libreadline6 \
-libreadline-dev \
-libsqlite3-dev \
-libncurses5-dev \
-libncursesw5-dev \
-xz-utils \
-tk-dev \
-libffi-dev \
-liblzma-dev
-
-pip3 install pipenv
-
-# Reload ~/.profile.  In recent Raspberry Pi OS releases, this automatically includes $HOME/.local/bin in the path once it exists.
-source ~/.profile
-
-# Test whether pipenv is in the system path now
-if ! which pipenv ; then
-    # It's not in the path, so we should add it on boot
-    printf "\n# Add $HOME/.local/bin to PATH for pipenv.\n# This was automatically added by Sphero RVR SDK first-time-setup.sh\n" >> ~/.profile
-    printf "PATH=\"\$HOME/.local/bin:\$PATH\"\n" >> ~/.profile
-    
-    # Apply the ~/.profile update to this session as well 
-    source ~/.profile
-fi
-
-python3 -m pipenv --python /usr/bin/python3.7
-
-# The cryptography package is a dependency, but for some reason pipenv can't always install it correctly, so we'll use pip instead.  ¯\_(ツ)_/¯
-python3 -m pipenv run pip install cryptography
-
-python3 -m pipenv install
-
-while true; do
-    read -ep $'By default, the RVR SDK uses the UART on /dev/ttys0 to communicate with RVR.\nDo you have Serial Port enabled and Serial Shell disabled in Raspberry Pi Configuration?\n(y/n):' yn
-    case $yn in
-        [Yy]* ) exit;;
-        [Nn]* ) 
-		read -p $'Would you like to open the command line raspi-config tool now to change these settings?\nYou can do this at any time with \'sudo raspi-config\'\n(y/n):' yn2
-		case $yn2 in 
-        		[Yy]* ) sudo raspi-config; break;;
-		        [Nn]* ) exit;;
-        		* ) echo "Please answer yes or no.";;
-    		esac 
-		break;;
-        * ) echo "Please answer yes or no.";;
-    esac
-done
+# This script guides a user through setting up the Sphero RVR Python SDK.
 
+# Install the SDK dependencies
+pip3 install -r requirements.txt
 
+# Provide an opportunity to correct the UART settings if needed.
+./tools/pi-uart-check.sh

first-time-simple-setup.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# This script guides a user through setting up the Sphero RVR Python SDK.
+
+# Install the SDK dependencies
+pip3 install -r requirements.txt
+
+./tools/pi-uart-check.sh

tools/pi-uart-check.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+sudo apt-get update -y
+
+sudo apt-get install -y make \
+build-essential \
+llvm \
+libssl-dev \
+bzip2 \
+zlib1g-dev \
+libbz2-dev \
+libreadline6 \
+libreadline-dev \
+libsqlite3-dev \
+libncurses5-dev \
+libncursesw5-dev \
+xz-utils \
+tk-dev \
+libffi-dev \
+liblzma-dev
+
+pip3 install pipenv
+
+# Reload ~/.profile.  In recent Raspberry Pi OS releases, this automatically includes $HOME/.local/bin in the path once it exists.
+source ~/.profile
+
+# Test whether pipenv is in the system path now
+if ! which pipenv ; then
+    # It's not in the path, so we should add it on boot
+    printf "\n# Add $HOME/.local/bin to PATH for pipenv.\n# This was automatically added by Sphero RVR SDK first-time-setup.sh\n" >> ~/.profile
+    printf "PATH=\"\$HOME/.local/bin:\$PATH\"\n" >> ~/.profile
+    
+    # Apply the ~/.profile update to this session as well 
+    source ~/.profile
+fi
+
+python3 -m pipenv --python /usr/bin/python3.7
+
+# The cryptography package is a dependency, but for some reason pipenv can't always install it correctly, so we'll use pip instead.  ¯\_(ツ)_/¯
+python3 -m pipenv run pip install cryptography
+
+python3 -m pipenv install
+
+# Provide an opportunity to correct the UART settings if needed.
+./pi-uart-check.sh