Merge pull request #245 from tegonal/improve/move-not-into-arithmetic-expresison

move the ! into the arithmetic expression

Author: robstoll

src/qa/run-shellcheck-pull-hooks.sh

@@ -39,7 +39,7 @@ sourceOnce "$dir_of_tegonal_scripts/qa/run-shellcheck.sh"
 
 #TODO remove file, runShellcheckPullHooks is no also in run-shellcheck.sh
 function runShellcheckPullHooks() {
-	if ! (($# == 1)); then
+	if (($# != 1)); then
 		logError "Exactly one parameter needs to be passed to runShellcheckPullHooks, given \033[0;36m%s\033[0m\nFollowing a description of the parameters:" "$#"
 		echo >&2 '1: gt_dir  working directory of gt'
 		printStackTrace

src/qa/run-shellcheck.sh

@@ -114,7 +114,7 @@ function runShellcheck() {
 }
 
 function runShellcheckPullHooks() {
-	if ! (($# == 1)); then
+	if (($# != 1)); then
 		logError "Exactly one parameter needs to be passed to runShellcheckPullHooks, given \033[0;36m%s\033[0m\nFollowing a description of the parameters:" "$#"
 		echo >&2 '1: gt_dir  working directory of gt'
 		printStackTrace

src/utility/array-utils.sh

@@ -84,7 +84,7 @@ joinByString() {
 }
 
 function arrFilter() {
-	if ! (($# == 3)); then
+	if (($# != 3)); then
 		logError "Three arguments needs to be passed to arrFilter, given \033[0;36m%s\033[0m\n" "$#"
 		echo >&2 '1: arrayIn    name of the array to filter'
 		echo >&2 '2: arrayOut   name of the array which will contain the result'
@@ -112,7 +112,7 @@ function arrFilter() {
 }
 
 function arrTakeEveryX() {
-	if ! (($# == 4)); then
+	if (($# != 4)); then
 		logError "Four arguments needs to be passed to arrTakeEveryX, given \033[0;36m%s\033[0m\n" "$#"
 		echo >&2 '1: arrayIn      name of the array to filter'
 		echo >&2 '2: arrayOut     name of the array which will contain the result'
@@ -139,7 +139,7 @@ function arrTakeEveryX() {
 }
 
 function arrStringEntryMaxLength() {
-	if ! (($# == 1)); then
+	if (($# != 1)); then
 		logError "One argument needs to be passed to arrStringEntryMaxLength, given \033[0;36m%s\033[0m\n" "$#"
 		echo >&2 '1: array      name of the array which contains strings'
 		printStackTrace

src/utility/checks.sh

@@ -92,7 +92,7 @@ sourceOnce "$dir_of_tegonal_scripts/utility/parse-fn-args.sh"
 sourceOnce "$dir_of_tegonal_scripts/utility/recursive-declare-p.sh"
 
 function checkArgIsArray() {
-	if ! (($# == 2)); then
+	if (($# != 2)); then
 		logError "Two arguments needs to be passed to checkArgIsArray, given \033[0;36m%s\033[0m\n" "$#"
 		echo >&2 '1: array      		  name of the array to check'
 		echo >&2 '2: argNumberOrName  what argument do we check (used in error message)'
@@ -133,7 +133,7 @@ function exitIfArgIsNotArrayOrIsEmpty() {
 }
 
 function checkArgIsArrayWithTuples() {
-	if ! (($# == 5)); then
+	if (($# != 5)); then
 		logError "Five arguments needs to be passed to checkArgIsArrayWithTuples, given \033[0;36m%s\033[0m\n" "$#"
 		echo >&2 '1: array            name of the array to check'
 		echo >&2 '2: tupleNum         the number of values of each tuple'
@@ -281,7 +281,7 @@ function checkArgIsVersion() {
 }
 
 function checkCommandExists() {
-	if ! (($# == 1 || $# == 2)); then
+	if (($# != 1 && $# != 2)); then
 		traceAndDie "you need to pass the name of the command to check to checkCommandExists and optionally an additional hint (e.g. install via...)"
 	fi
 	local -r name=$1
@@ -316,7 +316,7 @@ function exitIfVariablesNotDeclared() {
 }
 
 function checkPathIsInsideOf() {
-	if ! (($# == 2)); then
+	if (($# != 2)); then
 		logError "Two arguments needs to be passed to checkPathIsInsideOf, given \033[0;36m%s\033[0m\n" "$#"
 		echo >&2 '1: pathToCheck     the path which should be inside of rootDir'
 		echo >&2 '2: rootDir         the root directory'

src/utility/cleanups.sh

@@ -43,7 +43,7 @@ if ! [[ -v dir_of_tegonal_scripts ]]; then
 fi
 
 function removeUnusedSignatures() {
-	if ! (($# == 1)); then
+	if (($# != 1)); then
 		logError "One argument needs to be passed to removeUnusedSignatures, given \033[0;36m%s\033[0m\n" "$#"
 		echo >&2 '1: projectDir	the path to the root directory of the project'
 		printStackTrace

src/utility/git-utils.sh

@@ -103,7 +103,7 @@ function countCommits() {
 }
 
 function localGitIsAhead() {
-	if ! (($# == 1)) && ! (($# == 2)); then
+	if (($# != 1)) && (($# != 2)); then
 		traceAndDie "you need to pass at least the branch name to localGitIsAhead and optionally the name of the remote (defaults to origin) but not more, given: %s" "$#"
 	fi
 	local -r branch=$1
@@ -115,7 +115,7 @@ function localGitIsAhead() {
 }
 
 function localGitIsBehind() {
-	if ! (($# == 1)) && ! (($# == 2)); then
+	if (($# != 1)) && (($# != 2)); then
 		traceAndDie "you need to pass at least the branch name to localGitIsBehind and optionally the name of the remote (defaults to origin) but not more, given: %s" "$#"
 	fi
 	local -r branch=$1
@@ -127,7 +127,7 @@ function localGitIsBehind() {
 }
 
 function hasRemoteTag() {
-	if ! (($# == 1)) && ! (($# == 2)); then
+	if (($# != 1)) && (($# != 2)); then
 		traceAndDie "you need to pass at least the tag to hasRemoteTag and optionally the name of the remote (defaults to origin) but not more, given: %s" "$#"
 	fi
 	local -r tag=$1

src/utility/parse-args.sh

@@ -95,7 +95,7 @@ function parse_args_describeParameterTriple() {
 }
 
 function parse_args_exitIfParameterDefinitionIsNotTriple() {
-	if ! (($# == 1)); then
+	if (($# != 1)); then
 		logError "One argument needs to be passed to parse_args_exitIfParameterDefinitionIsNotTriple, given \033[0;36m%s\033[0m\nFollowing a description of the parameters:" "$#"
 		echo >&2 '1: params   the name of an array which contains the parameter definitions'
 		printStackTrace
@@ -207,7 +207,7 @@ function parseArgumentsInternal {
 }
 
 function parse_args_printHelp {
-	if ! (($# == 4)); then
+	if (($# != 4)); then
 		logError "Three arguments need to be passed to parse_args_printHelp, given \033[0;36m%s\033[0m\nFollowing a description of the parameters:" "$#"
 		echo >&2 '1: params       the name of an array which contains the parameter definitions'
 		echo >&2 '2: examples     a string containing examples (or an empty string)'
@@ -256,7 +256,7 @@ function parse_args_printHelp {
 }
 
 function exitIfNotAllArgumentsSet {
-	if ! (($# == 3)) && ! (($# == 4)); then
+	if (($# != 3)) && (($# != 4)); then
 		logError "Three arguments need to be passed to exitIfNotAllArgumentsSet, given \033[0;36m%s\033[0m\nFollowing a description of the parameters:" "$#"
 		echo >&2 '1: params    						the name of an array which contains the parameter definitions'
 		echo >&2 '2: examples 						a string containing examples (or an empty string)'

src/utility/parse-commands.sh

@@ -90,7 +90,7 @@ function parse_commands_describeParameterPair() {
 }
 
 function parse_commands_checkParameterDefinitionIsPair() {
-	if ! (($# == 1)); then
+	if (($# != 1)); then
 		logError "One parameter needs to be passed to parse_commands_checkParameterDefinitionIsPair, given \033[0;36m%s\033[0m\nFollowing a description of the parameters:" "$#"
 		echo >&2 '1: params   the name of an array which contains the command definitions'
 		printStackTrace
@@ -152,7 +152,7 @@ function parseCommands {
 }
 
 function parse_commands_printHelp() {
-	if ! (($# == 2)); then
+	if (($# != 2)); then
 		logError "Two arguments need to be passed to parse_commands_help, given \033[0;36m%s\033[0m\nFollowing a description of the parameters:" "$#"
 		echo >&2 '1: commands   the name of an array which contains the command definitions'
 		echo >&2 '2: version    the version which shall be shown if one uses --version'

src/utility/parse-fn-args.sh

@@ -114,7 +114,7 @@ function parseFnArgs() {
 		exit 9
 	fi
 
-	if [[ $parseFnArgs_withVarArgs == false ]] && ! (($# == ${#parseFnArgs_paramArr1[@]})); then
+	if [[ $parseFnArgs_withVarArgs == false ]] && (($# != ${#parseFnArgs_paramArr1[@]})); then
 		logError "more arguments supplied to \033[0m\033[0;36m%s\033[0m than expected\nExpected %s, given %s" \
 			"${FUNCNAME[1]}" "${#parseFnArgs_paramArr1[@]}" "$#"
 		echo >&2 "in case you wanted your last parameter to be a vararg parameter, then use 'varargs' as last variable name in your array containing the parameter names."

src/utility/recursive-declare-p.sh

@@ -54,7 +54,7 @@ if ! [[ -v dir_of_tegonal_scripts ]]; then
 fi
 
 function recursiveDeclareP() {
-	if ! (($# == 1)); then
+	if (($# != 1)); then
 		traceAndDie "you need to pass the variable name, whose declaration statement shall be determined, to recursiveDeclareP"
 	fi