From f4dd3e2bb39e316aec3361498d807880281207b6 Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Wed, 22 Aug 2018 11:10:32 -0500
Subject: [PATCH] bspwm: Stop using expr where I don't have to

---
 .config/bspwm/monitorset.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.config/bspwm/monitorset.sh b/.config/bspwm/monitorset.sh
index e8a9536f..bb4b1371 100755
--- a/.config/bspwm/monitorset.sh
+++ b/.config/bspwm/monitorset.sh
@@ -13,7 +13,7 @@ monitors_secondary=($(xrandr -q | grep ' connected' | grep -v 'primary' | awk '{
 
 desktops_total=${BSPWM_DESKTOPS_TOTAL:-8}
 desktops_primary=${BSPWM_DESKTOPS_PRIMARY:-6}
-desktops_secondary=$(expr $desktops_total - $desktops_primary)
+desktops_secondary=$(($desktops_total - $desktops_primary))
 
 # Sanity checks
 if ! [[ "$desktops_total" -ge 1 ]]; then
@@ -31,7 +31,7 @@ if [[ $desktops_secondary -lt ${#monitors_secondary[@]} ]]; then
 	printf "  [WARN] Configuration would leave some monitors without desktops!\n" 1>&2
 	printf "    [INFO] Adding more desktops\n"
 	desktops_secondary=${#monitors_secondary[@]}
-	desktops_total=$(expr $desktops_secondary + $desktops_primary)
+	desktops_total=$(($desktops_secondary + $desktops_primary))
 	deskpermon=1
 	printf "    [INFO] Remaining desktops set to $desktops_secondary, highest desktop is now $desktops_total\n"
 fi
@@ -39,9 +39,9 @@ fi
 # Can we actually reach all of these desktops via keybinds?
 if [[ $desktops_total -gt 10 ]]; then
 	printf "  [WARN] More than ten desktops were allocated! Not all of these can be reached via keybinds!\n" 1>&2
-	if [[ $(expr $desktops_total - $desktops_secondary) -gt 0 ]]; then
+	if [[ $(($desktops_total - $desktops_secondary)) -gt 0 ]]; then
 		printf "    [INFO] Adjusting primary desktop reservation\n"
-		desktops_primary=$(expr $desktops_total - $desktops_secondary)
+		desktops_primary=$(($desktops_total - $desktops_secondary))
 		printf "    [INFO] Set reserved desktops to $desktops_primary\n"
 	else
 		printf "    [WARN] Cannot resolve this situation without starving the primary monitor of desktops!\n"
@@ -58,14 +58,14 @@ if [[ $(echo ${monitors_secondary:-0}) == "0" ]]; then
 	printf "  [INFO] Found one monitor: $monitor_primary, so giving it layout \"$layout\"\n"
 	bspc monitor $monitor_primary -d $layout
 else
-	deskpermon=$(expr $desktops_secondary / ${#monitors_secondary[@]})
+	deskpermon=$(($desktops_secondary / ${#monitors_secondary[@]}))
 	layout=$(seq --separator=" " 1 $desktops_primary)
 	printf "  [INFO] Giving primary monitor $monitor_primary layout \"$layout\"\n"
 	bspc monitor $monitor_primary -d $layout
 	unset layout
 	printf "  [INFO] Attempting to put $desktops_secondary desktops across ${#monitors_secondary[@]} monitors, $deskpermon each\n"
-	for m in $(seq 0 $(expr ${#monitors_secondary[@]} - 1)); do
-		layout=$(seq --separator=" " $(expr 1 + $m + $desktops_primary) ${#monitors_secondary[@]} $(expr $desktops_total ))
+	for m in $(seq 0 $((${#monitors_secondary[@]} - 1))); do
+		layout=$(seq --separator=" " $((1 + $m + $desktops_primary)) ${#monitors_secondary[@]} "$desktops_total")
 		printf "    [INFO] Giving monitor $m (${monitors_secondary[$m]}) layout \"$layout\"\n"
 		bspc monitor ${monitors_secondary[$m]} -d $layout
 	done