diff --git a/install.sh b/install.sh
index a95bcc5..b171d6c 100755
--- a/install.sh
+++ b/install.sh
@@ -15,7 +15,7 @@ function download_files() {
   local query_params=''
   [ -n "$GIT_TAG" ] && query_params="?ref=$GIT_TAG"
 
-  while [ -n "$1" ]; do
+  while (( $# > 0 )); do
     path=$1
     shift
     curl -s --output-dir "$TMPDIR/" --remote-name "$API_ENDPOINT/raw/$path$query_params"
diff --git a/pbc b/pbc
index 5d08b45..8dc5ff9 100755
--- a/pbc
+++ b/pbc
@@ -164,7 +164,7 @@ function arr_contains() {
   local search=$1
   shift
   [ -z "$search" ] && return 1
-  while [ -n "$1" ]; do
+  while (( $# > 0 )); do
     [ "$1" == "$search" ] && return 0
     shift
   done
@@ -209,7 +209,7 @@ action=''
 cfgfile="$ETC_DIR/config"
 args=()
 
-while [ -n "$1" ]; do
+while (( $# > 0 )); do
   opt=$1
   shift
   if [ -z "$action" ]; then