Moving parameter validation up to let users run ut_run from /

viniciusam · viniciusam · commit dc9fb518f730 · 2017-05-10T20:52:26.000-03:00
diff --git a/client_source/sqlplus/file_list b/client_source/sqlplus/file_list
@@ -1,25 +1,25 @@
 #!/bin/bash
 set -e
 
-clientPath=${1%/}
-projectPath=${2%/}
-scanPath=$3
-outFileName=$4
-sqlParamName=$5
-
-# All parameters are required.
+# All parameters are required. This way, users can't pass empty string as parameter.
 invalidArgs=0
-[ -z "$clientPath"   ] && invalidArgs=1
-[ -z "$projectPath"  ] && invalidArgs=1
-[ -z "$scanPath"     ] && invalidArgs=1
-[ -z "$outFileName"  ] && invalidArgs=1
-[ -z "$sqlParamName" ] && invalidArgs=1
+[ -z "$1" ] && invalidArgs=1
+[ -z "$2" ] && invalidArgs=1
+[ -z "$3" ] && invalidArgs=1
+[ -z "$4" ] && invalidArgs=1
+[ -z "$5" ] && invalidArgs=1
 
 if [ $invalidArgs -eq 1 ]; then
     echo Usage: ut_run.sh "client_path" "project_path" "scan_path" "out_file_name" "sql_param_name"
     exit 1
 fi
 
+clientPath=${1%/}
+projectPath=${2%/}
+scanPath=$3
+outFileName=$4
+sqlParamName=$5
+
 fullOutPath="$clientPath/$outFileName"
 fullScanPath="$projectPath/$scanPath"
 
diff --git a/client_source/sqlplus/file_list.bat b/client_source/sqlplus/file_list.bat
@@ -1,25 +1,25 @@
 @echo off
 setlocal EnableDelayedExpansion
 
-set clientPath=%~1
-set projectPath=%~2
-set scanPath=%~3
-set outFileName=%~4
-set sqlParamName=%~5
-
-REM All parameters are required.
+REM All parameters are required. This way, users can't pass empty string as parameter.
 set invalidArgs=0
-if "%clientPath%"   == "" set invalidArgs=1
-if "%projectPath%"  == "" set invalidArgs=1
-if "%scanPath%"     == "" set invalidArgs=1
-if "%outFileName%"  == "" set invalidArgs=1
-if "%sqlParamName%" == "" set invalidArgs=1
+if "%1" == "" set invalidArgs=1
+if "%2" == "" set invalidArgs=1
+if "%3" == "" set invalidArgs=1
+if "%4" == "" set invalidArgs=1
+if "%5" == "" set invalidArgs=1
 
 if %invalidArgs% == 1 (
     echo Usage: ut_run.bat "client_path" "project_path" "scan_path" "out_file_name" "sql_param_name"
     exit /b 1
 )
 
+set clientPath=%~1
+set projectPath=%~2
+set scanPath=%~3
+set outFileName=%~4
+set sqlParamName=%~5
+
 REM Remove trailing slashes.
 if %clientPath:~-1%==\  set clientPath=%clientPath:~0,-1%
 if %projectPath:~-1%==\ set projectPath=%projectPath:~0,-1%
diff --git a/client_source/sqlplus/ut_run b/client_source/sqlplus/ut_run
@@ -1,15 +1,10 @@
 #!/bin/bash
 set -e
 
-# Not forget to convert line endings to Unix.
-# http://linuxcommand.org/man_pages/dos2unix1.html
-# sed -i 's/\r//' ut_run
-# sed -i 's/\r//' file_list
-
 clientDir="$(dirname "$(readlink -f "$0")")"
 projectDir="$(pwd)"
 
-if [ "$clientDir" != "${clientDir% *}" ]; then
+if [[ "$clientDir" != "${clientDir% *}" ]]; then
     echo "Error: ut_run script path cannot have spaces."
     exit 1
 fi
