netcfg current and netcfg list

These and "netcfg version" don't require root privileges.

Signed-off-by: Jim Pryor <profjim@jimpryor.net>

1 files changed, 26 insertions, 2 deletions

diff --git a/src/netcfg b/src/netcfg
index bea963c..50d9bcf 100644
--- a/src/netcfg
+++ b/src/netcfg
@@ -17,25 +17,49 @@ usage()
     echo "      Start specified profile:    netcfg profile " 
     echo "      Other functions:            netcfg argument profile"
     echo "Arguments:"
+    echo "    current        Report currently running profiles"
     echo "-a, all-down       Take all active profiles down"
     echo "-c, check-iface    Do not start profile if interface is already up"
     echo "-d, down           Take specified profile down"
     echo "-h, help           This help message"
     echo "-i, iface-down     Take down profile active on specified interface"
+    echo "-l, list           List all available profiles"
 		echo "-r, reconnect      Disconnect and reconnect specified profile"
 		echo "-u, up             Start specified profile"
     echo "-v, version        Output version information and exit"
     echo "    all-resume     Resume previously suspended profiles and reconnect them"
     echo "    all-suspend    Store a list of current running profiles and suspend them"
+		exit 1
 }
 
 # TODO: Re-add ROOT check and rewrite with getopts from BashFAQ
 
-case $1 in
+case "$1" in
     --version|-v|version) 
-        version;;
+        version
+				exit 0;;
     --help|-h|help) 
         usage;;
+		list|-l)
+				echo "Available Profiles"
+				echo "------------------"
+				list_profiles
+				exit 0;;
+		current)
+				if [[ -d "$STATE_DIR/profiles/" ]]; then
+						ls "$STATE_DIR/profiles/"
+						exit 0
+				else
+						exit_stderr "No active profiles."
+				fi;;
+esac
+
+if [[ $(id -u) -gt 0 ]]; then
+		exit_stderr "This script should be run as root."
+fi
+
+case "$1" in
+
     -c|check-iface|-u|up)
         CHECK="YES"; 
         profile_up $2;;