Skip to content

Commit b39360e

Browse files
committed
use "if not defined"
1 parent a40d869 commit b39360e

File tree

3 files changed

+8
-13
lines changed

3 files changed

+8
-13
lines changed

modules/files.cmd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ goto :eof
1111
setlocal
1212
set abs_path=%~f1
1313
set result_var=%~2
14-
if "%result_var%" == "" (
14+
if not defined result_var (
1515
echo %abs_path%
1616
exit /B 0
1717
)
@@ -23,7 +23,7 @@ goto :eof
2323
setlocal
2424
set basename=%~nx1
2525
set result_var=%~2
26-
if "%result_var%" == "" (
26+
if not defined result_var (
2727
echo %basename%
2828
exit /B 0
2929
)
@@ -34,7 +34,7 @@ goto :eof
3434
setlocal
3535
set basename=%~n1
3636
set result_var=%~2
37-
if "%result_var%" == "" (
37+
if not defined result_var (
3838
echo %basename%
3939
exit /B 0
4040
)
@@ -46,7 +46,7 @@ goto :eof
4646
set file_path=%~1
4747
set result_var=%~2
4848
set /P content=<"%file_path%"
49-
if "%result_var%" == "" (
49+
if not defined result_var (
5050
echo %content%
5151
exit /B 0
5252
)

modules/miscs.cmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ goto :eof
2525
for /F "tokens=2* skip=2" %%a in ('reg query "%reg_path%" /v Path') do (
2626
set "value=%%b"
2727
)
28-
if "%result_var%" == "" (
28+
if not defined result_var (
2929
echo %value%
3030
exit /B 0
3131
)
@@ -37,7 +37,7 @@ goto :eof
3737
setlocal
3838
set result_var=%~1
3939
for /F "tokens=4-5 delims=. " %%i in ('ver') do set win_major_ver=%%i
40-
if "%result_var%" == "" (
40+
if not defined result_var (
4141
echo %win_major_ver%
4242
exit /B 0
4343
)

modules/strings.cmd

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ goto :eof
3434

3535
call set result=%%search_in:%search_for%=%replace_with%%%
3636

37-
if "%result_var%" == "" (
37+
if not defined result_var (
3838
echo %result%
3939
exit /B 0
4040
)
@@ -48,13 +48,8 @@ goto :eof
4848
set separator=%~2
4949
set result_var=%~3
5050

51-
if "%result_var%" == "" (
52-
echo %0 - Argument RESULT_VAR missing!
53-
exit /B 1
54-
)
55-
5651
for /F "delims=%separator%" %%a in ("%search_in%") do (
57-
if "%result_var%" == "" (
52+
if not defined result_var (
5853
echo %result%
5954
) else (
6055
endlocal & set "%result_var%=%%a"

0 commit comments

Comments
 (0)