Improve style

rjust · Sep 5, 2024 · 33bb1f6 · 33bb1f6
1 parent c865d56
commit 33bb1f6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/framework/lib/test_generation/bin/_tool.source b/framework/lib/test_generation/bin/_tool.source
@@ -1,3 +1,4 @@
+#!/bin/bash
 #
 # This file provides helper functions for the wrapper shell scripts of the test
 # generation tools. This file should be included in each wrapper shell script:
@@ -10,8 +11,6 @@
 #   separate words.
 #
 
-# shellcheck shell=bash
-
 ################################################################################
 # Helper functions
 ################################################################################
@@ -25,8 +24,7 @@ die() {
 check_env() {
     local var="$1"
     local val
-    # shellcheck disable=SC2086 # would quoting even work?
-    val=$(eval echo \$$var)
+    val="$(eval echo \$$var)"
     [ -z "$val" ] && die "Variable $var not set!"
 }
 

diff --git a/framework/projects/Mockito/chooseDepedencyVersion.sh b/framework/projects/Mockito/chooseDepedencyVersion.sh
@@ -7,7 +7,7 @@
 cd "$1" || (echo "cannot cd to workdir $1" && exit 1)
 ./gradlew dependencies >> tmpDepend.txt
 if grep -q buddy tmpDepend.txt; then
-    version=$(grep buddy tmpDepend.txt | cut -d: -f 3 | head -1)
-    cp "$2/framework/projects/Mockito/byte-buddy/byte-buddy-$version.jar" "$1"/compileLib/
+    version=$(grep buddy tmpDepend.txt | head -1 | cut -d: -f 3)
+    cp "$2/framework/projects/Mockito/byte-buddy/byte-buddy-$version.jar" "$1/compileLib/"
 fi
 rm tmpDepend.txt
diff --git a/framework/test/test_export_command.sh b/framework/test/test_export_command.sh
@@ -131,7 +131,7 @@ test_export_properties() {
         #################################################################
         # Check "dir.bin.classes"
         #################################################################
-        local classes_dir=""; 
+        local classes_dir=""
         if ! classes_dir=$(_run_export_command "$work_dir" "dir.bin.classes") ; then
             die "Export command of $pid-$bid has failed"
         fi