From 0890158648d2597c4c89ee50d7f0557f52861b04 Mon Sep 17 00:00:00 2001
From: Sarah Ramazani <62920905+sarahrams@users.noreply.github.com>
Date: Thu, 2 Jul 2020 20:53:35 -0700
Subject: [PATCH] `treehouses usb` refactor (fixes #1580) (#1581)

Co-authored-by: dogi <dogi@users.noreply.github.com>
---
 modules/usb.sh | 100 +++++++++++++++++++++++++++----------------------
 package.json   |   2 +-
 2 files changed, 56 insertions(+), 46 deletions(-)

diff --git a/modules/usb.sh b/modules/usb.sh
index 5caa2c037..6174e422a 100644
--- a/modules/usb.sh
+++ b/modules/usb.sh
@@ -14,56 +14,66 @@ function usb {
   command="$1"
 
   if [[ $(detectrpi) =~ 'RPI3' ]]; then
-    if [ "$command" = "on" ]; then
-      /usr/local/bin/hub-ctrl -h 1 -P 2 -p 1
+    case $command in
+      "on")
+        /usr/local/bin/hub-ctrl -h 1 -P 2 -p 1
 
-      echo "usb ports turned on"
-    elif [ "$command" = "off" ]; then
-      /usr/local/bin/hub-ctrl -h 1 -P 2 -p
+        echo "usb ports turned on"
+        ;;
+      "off")
+        /usr/local/bin/hub-ctrl -h 1 -P 2 -p
 
-      echo "usb ports turned off"
-    elif [ "$command" = "" ]; then
-      lsusb -t
-    else
-      echo "Error: unknown command"
-      usb_help
-      exit 1
-    fi
+        echo "usb ports turned off"
+        ;;
+      "")
+        lsusb -t
+        ;;
+      *)
+        echo "Error: unknown command"
+        usb_help
+        exit 1
+        ;;
+    esac 
   elif [[ $(detectrpi) =~ 'RPI4' ]]; then
-    if [ "$command" = "on" ]; then
-      /usr/local/bin/hub-ctrl -h 2 -P 1 -p 1
-      /usr/local/bin/hub-ctrl -h 2 -P 2 -p 1
-      /usr/local/bin/hub-ctrl -h 2 -P 3 -p 1
-      /usr/local/bin/hub-ctrl -h 2 -P 4 -p 1
-      /usr/local/bin/hub-ctrl -h 1 -P 1 -p 1
+    case $command in
+      "on")
+        /usr/local/bin/hub-ctrl -h 2 -P 1 -p 1
+        /usr/local/bin/hub-ctrl -h 2 -P 2 -p 1
+        /usr/local/bin/hub-ctrl -h 2 -P 3 -p 1
+        /usr/local/bin/hub-ctrl -h 2 -P 4 -p 1
+        /usr/local/bin/hub-ctrl -h 1 -P 1 -p 1
 
-      echo "usb ports turned on"
-    elif [ "$command" = "off" ]; then
-      # check for connected ethernet
-      if [ "$(</sys/class/net/eth0/carrier)" = "1" ]; then
-        read -r -p "The ethernet port on your Raspberry Pi 4 is connected. Turning off usb power will interfere with your ethernet connection. Do you wish to continue? Y or N" yn
-        case $yn in
-          [Yy]*)
-            ;;
-          [Nn]*)
-            exit
-            ;;
-        esac
-      fi
-      /usr/local/bin/hub-ctrl -h 2 -P 1 -p
-      /usr/local/bin/hub-ctrl -h 2 -P 2 -p
-      /usr/local/bin/hub-ctrl -h 2 -P 3 -p
-      /usr/local/bin/hub-ctrl -h 2 -P 4 -p
-      /usr/local/bin/hub-ctrl -h 1 -P 1 -p
+        echo "usb ports turned on"
+        ;;
+      "off")
+        # check for connected ethernet
+        if [ "$(</sys/class/net/eth0/carrier)" = "1" ]; then
+          read -r -p "The ethernet port on your Raspberry Pi 4 is connected. Turning off usb power will interfere with your ethernet connection. Do you wish to continue? Y or N" yn
+          case $yn in
+            [Yy]*)
+              ;;
+            [Nn]*)
+              exit
+              ;;
+          esac
+        fi
+        /usr/local/bin/hub-ctrl -h 2 -P 1 -p
+        /usr/local/bin/hub-ctrl -h 2 -P 2 -p
+        /usr/local/bin/hub-ctrl -h 2 -P 3 -p
+        /usr/local/bin/hub-ctrl -h 2 -P 4 -p
+        /usr/local/bin/hub-ctrl -h 1 -P 1 -p
 
-      echo "usb ports turned off"
-    elif [ "$command" = "" ]; then
-      lsusb -t
-    else
-      echo "Error: unknown command"
-      usb_help
-      exit 1
-    fi
+        echo "usb ports turned off"
+        ;;
+      "")
+        lsusb -t
+        ;;
+      *)
+        echo "Error: unknown command"
+        usb_help
+        exit 1
+        ;;
+    esac
   fi
 }
 
diff --git a/package.json b/package.json
index 973fa99b0..b1311b3a4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@treehouses/cli",
-  "version": "1.22.47",
+  "version": "1.22.48",
   "remote": "2346",
   "description": "Thin command-line interface for Raspberry Pi low level configuration.",
   "main": "cli.sh",