Improve device selection and dependency check

bitsnet

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-
 # Load util functions
 source ~/.local/lib/bitsnet/util.sh
 
@@ -77,14 +76,10 @@ if [[ "$dev" == "0" ]]; then
 fi
 
 
-# Select correct login page according to IP
-# and load corresponding login_url
-# Nothing to do here for now
-
-
 # Login
 debug_msg ""
 debug_msg "Logging in"
+# If dev is wifi and IP is not library IP
 if [[ "$dev" == "2" && "$(hostname -I)" != "10.20"* ]]; then
     # Log into the router
     debug_msg "Connected to wifi. Sending request to cisco router form"

install

@@ -1,10 +1,20 @@
 #!/bin/sh
 
-# Check if curl and wget installed
+# Check if wget installed
 if ! which wget > /dev/null ; then
     echo "wget not installed"
     exit
 fi
+# Check if git installed for update
+if ! which git > /dev/null ; then
+    echo "git not installed"
+    exit
+fi
+# Check if nmcli installed
+if ! which nmcli > /dev/null ; then
+    echo "nmcli not installed"
+    exit
+fi
 
 # Copy config file to the right place
 if ! which bitsnet > /dev/null ; then

util.sh

@@ -69,6 +69,10 @@ function log_out {
 
 function get_device {
     devInfo="$(nmcli dev | grep " connected" | cut -d " " -f1)"
+    if [[ $devInfo == "virbr"* ]]; then
+        # If the connection is through a virtual bridge, select the next device
+        devInfo=$(echo "$devInfo" | sed 1,1d)
+    fi;
     if [[ $devInfo == "en"* ]]; then
         # ethernet
         dev=1