From b8797284031edbfd4c22f19f4878418cf4b2ec10 Mon Sep 17 00:00:00 2001
From: Steven Hall <Hallzy.18@gmail.com>
Date: Fri, 16 Oct 2015 11:31:21 -0700
Subject: Made changes recommeneded by @michaeldfallen

in fetch.sh "if" now checks for $@ instead of just $1

in radar-base.sh there is now a parameter expansion on line 170 instead of the
if statements.

in git-radar, now there is a shift, and a regex check that the next value is a
number. If the next value after --fetch_t is not a number, an error is echo'd
and it resorts to the default behaviour of 5 minutes.
---
 fetch.sh      |  2 +-
 git-radar     | 15 +++++++++++++--
 radar-base.sh |  7 +------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/fetch.sh b/fetch.sh
index a3fc571..877fa7b 100755
--- a/fetch.sh
+++ b/fetch.sh
@@ -10,7 +10,7 @@ dot="$(cd "$(dirname "$([ -L "$0" ] && $READLINK_CMD -f "$0" || echo "$0")")"; p
 
 source $dot/radar-base.sh
 
-if [[ -z "$1" ]]; then
+if [[ -z "$@" ]]; then
   fetch;
 else
   fetch $1;
diff --git a/git-radar b/git-radar
index c3f7aa3..a38f00f 100755
--- a/git-radar
+++ b/git-radar
@@ -100,8 +100,19 @@ while [[ $# > 0 ]];do
 
   # Custom fetch of whatever time interval the user wants
   if [[ "$command" == "--fetch_t" ]]; then
-    # Now $1 is the value of fetch_t
-    nohup $dot/fetch.sh $1 >/dev/null 2>&1 &
+    # Now $1 is the value for fetch_t
+    # If value is not a number produce an error
+    if ! [[ $1 =~ ^[0-9]+$ ]] ; then
+      echo ""
+      echo "Error: fetch_t did not receive a number"
+      echo "Defaulting to 5 min."
+      echo " "
+      nohup $dot/fetch.sh >/dev/null 2>&1 &
+    else
+      command="$1"
+      shift
+      nohup $dot/fetch.sh $command >/dev/null 2>&1 &
+    fi
   fi
 
   if [[ "$command" == "--zsh" ]]; then
diff --git a/radar-base.sh b/radar-base.sh
index ee5fa00..886a6e9 100755
--- a/radar-base.sh
+++ b/radar-base.sh
@@ -167,12 +167,7 @@ time_to_update() {
 }
 
 fetch() {
-  if [ -z "$1" ]; then
-    # Default 5 minutes
-    local timeToUpdate="$((5 * 60))"
-  else
-    local timeToUpdate="$1"
-  fi
+  local timeToUpdate = ${"$1":-"$((5 * 60))"}
 
   if time_to_update $timeToUpdate; then
     record_timestamp
-- 
cgit v1.2.3