shellcheck change, $ is unnecessary on arithmetic variables.

faiproject · May 19, 2020 · 143b9ed · 143b9ed
1 parent 87501da
commit 143b9ed
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 16 deletions.
diff --git a/bin/fai-cd b/bin/fai-cd
@@ -241,7 +241,7 @@ calculate_required_size() {
 
     # not dividing by 1024 to get the exact, this allows us to get some additional space
     # add some addition space
-    count=$(($size/850 + $space))
+    count=$((size/850 + space))
 }
 
 provide_memtest_boot_option() {
@@ -407,7 +407,7 @@ while getopts "AekfhHg:Jbs:SBMn:m:V:c:C:d:" opt ; do
         ?)  usage ;;
     esac
 done
-shift $(($OPTIND - 1))
+shift $((OPTIND - 1))
 isoname=$1
 
 

diff --git a/bin/fai-class b/bin/fai-class
@@ -110,7 +110,7 @@ setup() {
         *) usage 1 ;;
         esac
     done
-    shift $(($OPTIND - 1))
+    shift $((OPTIND - 1))
     [ -z "$2" ] || [ -n "$3" ] && usage 1
 
     classdir=$1

diff --git a/bin/fai-debconf b/bin/fai-debconf
@@ -106,7 +106,7 @@ while getopts "hvsfd" opt ; do
         v) verbose=1; v=-v ;;
     esac
 done
-shift $(($OPTIND - 1))
+shift $((OPTIND - 1))
 [ -z "$1" ] || [ -n "$2" ] && usage 1
 debconfdir=$1 # will be $FAI/debconf
 

diff --git a/bin/fai-diskimage b/bin/fai-diskimage
@@ -27,7 +27,7 @@ cleanup() {
 	for i in {1..8}; do
             umount $dir >&/dev/null
             [ $? -eq 0 ] && break
-            [ $(($i % 3)) -eq 0 ] && echo "Waiting for background jobs to finish."
+            [ $((i % 3)) -eq 0 ] && echo "Waiting for background jobs to finish."
 	    sleep $i
 	done
     done

diff --git a/bin/fai-do-scripts b/bin/fai-do-scripts
@@ -215,7 +215,7 @@ while getopts "nhL:" opt ; do
         n) fake=1 ;;
     esac
 done
-shift $(($OPTIND - 1))
+shift $((OPTIND - 1))
 [ -z "$1" ] || [ -n "$2" ] && usage 1
 
 if [ "x$classes" = "x" ]; then
@@ -227,5 +227,5 @@ fi
 
 call_conf $1
 # move error number from child scripts to 100+x if any error happened
-[ $maxstatus -gt 0 ] && maxstatus=$((100+$maxstatus))
+[ $maxstatus -gt 0 ] && maxstatus=$((100+maxstatus))
 exit $maxstatus
diff --git a/bin/fai-mirror b/bin/fai-mirror
@@ -272,7 +272,7 @@ while getopts "a:bBvhx:pc:C:m:s:P:V" opt ; do
         ?) die 1 "Unknown option";;
     esac
 done
-shift $(($OPTIND - 1))
+shift $((OPTIND - 1))
 
 # use FAI_ETC_DIR from environment variable
 [ -n "$FAI_ETC_DIR" -a -z "$cfdir" ] && echo "Using environment variable \$FAI_ETC_DIR."

diff --git a/bin/ftar b/bin/ftar
@@ -110,7 +110,7 @@ while getopts 1hDdrvs:t:c:i opt ; do
         h) usage ;;
         esac
 done
-shift $(($OPTIND - 1))
+shift $((OPTIND - 1))
 
 [ "$1" ] || usage
 

diff --git a/dev-utils/fai-kvm b/dev-utils/fai-kvm
@@ -106,7 +106,7 @@ while getopts "EbUhnNu:s:m:d:VD:t:" opt ; do
         ?) die 1 "Unknown option";;
     esac
 done
-shift $(($OPTIND - 1))
+shift $((OPTIND - 1))
 
 if [ -z "$1" ]; then
     echo Missing argument. pxe, cd or disk

diff --git a/dev-utils/fai-mk-network b/dev-utils/fai-mk-network
@@ -135,7 +135,7 @@ while getopts Phri: opt ; do
 	i) netdev=$OPTARG ;;
     esac
 done
-shift $(($OPTIND - 1))
+shift $((OPTIND - 1))
 
 if [ $(id -u) != "0" ]; then
     echo "You must run this program as root."

diff --git a/examples/simple b/examples/simple
diff --git a/lib/fetch-basefile b/lib/fetch-basefile
@@ -36,7 +36,7 @@ while getopts m opt ; do
         m) mount=1 ;;
     esac
 done
-#shift $(($OPTIND - 1))
+#shift $((OPTIND - 1))
 
 # get list of all files at URL
 flist=$(lftp -e 'cls;exit' $url 2>/dev/null)

diff --git a/lib/mkramdisk b/lib/mkramdisk
@@ -79,7 +79,7 @@ while getopts ans:u opt ; do
         n) mtab="-n" ;;      # do not wirte to /etc/mtab
         esac
 done
-shift $(($OPTIND - 1))
+shift $((OPTIND - 1))
 
 if [ -n "$FAI_NORAMDISK" ]; then
     echo "The use of \$FAI_NORAMDISK is now deprecated. Please use \$FAI_RAMDISKS instead." >&2

diff --git a/lib/subroutines b/lib/subroutines
@@ -244,7 +244,7 @@ task() {
         task_error_func=''
         taskduration[$taskname]=$SECONDS
         task_$taskname "$@"
-        [ $duration -eq 1 ] && echo "Duration of task $taskname: " $(($SECONDS-${taskduration[$taskname]}))"s"
+        [ $duration -eq 1 ] && echo "Duration of task $taskname: " $((SECONDS-${taskduration[$taskname]}))"s"
         sendmon "TASKEND $taskname $task_local_error"
         if [ "$task_local_error" -ne 0 ] ; then
           echo "Exit code task_$taskname: $task_local_error" >&2
@@ -1165,7 +1165,7 @@ task_finish() {
     fai-divert -R
     rm -f $FAI_ROOT/etc/apt/apt.conf.d/{10,90}fai
     echo -n "FAI finished at: ";date
-    echo "The $FAI_ACTION took $(($(cut -d . -f 1 /proc/uptime)-$start_seconds)) seconds."
+    echo "The $FAI_ACTION took $(($(cut -d . -f 1 /proc/uptime) - start_seconds)) seconds."
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 task_chboot() {