fix windows sript if var expansion

Johnny · Johnny · commit 346b582878b8 · 2019-04-11T14:10:25.000-05:00
diff --git a/installer/src/main/bin/createDomain.cmd b/installer/src/main/bin/createDomain.cmd
@@ -154,8 +154,7 @@ IF NOT "%~1" == "" (
 SET SCRIPT_ARGS=%*
 @rem Default domain type if not specified
 IF "%DOMAIN_TYPE%"=="" (
-    SET DOMAIN_TYPE=WLS
-    SET SCRIPT_ARGS=%SCRIPT_ARGS% -domain_type %DOMAIN_TYPE%
+    SET SCRIPT_ARGS=%SCRIPT_ARGS% -domain_type WLS
 )
 
 
diff --git a/installer/src/main/bin/deployApps.cmd b/installer/src/main/bin/deployApps.cmd
@@ -152,8 +152,7 @@ IF NOT "%~1" == "" (
 SET SCRIPT_ARGS=%*
 @rem Default domain type if not specified
 IF "%DOMAIN_TYPE%"=="" (
-    SET DOMAIN_TYPE=WLS
-    SET SCRIPT_ARGS=%SCRIPT_ARGS% -domain_type %DOMAIN_TYPE%
+    SET SCRIPT_ARGS=%SCRIPT_ARGS% -domain_type WLS
 )
 
 @rem
diff --git a/installer/src/main/bin/discoverDomain.cmd b/installer/src/main/bin/discoverDomain.cmd
@@ -161,8 +161,7 @@ IF NOT "%~1" == "" (
 SET SCRIPT_ARGS=%*
 @rem Default domain type if not specified
 IF "%DOMAIN_TYPE%"=="" (
-    SET DOMAIN_TYPE=WLS
-    SET SCRIPT_ARGS=%SCRIPT_ARGS% -domain_type %DOMAIN_TYPE%
+    SET SCRIPT_ARGS=%SCRIPT_ARGS% -domain_type WLS
 )
 
 @rem
diff --git a/installer/src/main/bin/encryptModel.cmd b/installer/src/main/bin/encryptModel.cmd
@@ -170,8 +170,7 @@ IF NOT "%~1" == "" (
 SET SCRIPT_ARGS=%*
 @rem Default domain type if not specified
 IF "%DOMAIN_TYPE%"=="" (
-    SET DOMAIN_TYPE=WLS
-    SET SCRIPT_ARGS=%SCRIPT_ARGS% -domain_type %DOMAIN_TYPE%
+    SET SCRIPT_ARGS=%SCRIPT_ARGS% -domain_type WLS
 )
 
 @rem
diff --git a/installer/src/main/bin/injectVariables.cmd b/installer/src/main/bin/injectVariables.cmd
@@ -164,8 +164,7 @@ IF NOT "%~1" == "" (
 SET SCRIPT_ARGS=%*
 @rem Default domain type if not specified
 IF "%DOMAIN_TYPE%"=="" (
-    SET DOMAIN_TYPE=WLS
-    SET SCRIPT_ARGS=%SCRIPT_ARGS% -domain_type %DOMAIN_TYPE%
+    SET SCRIPT_ARGS=%SCRIPT_ARGS% -domain_type WLS
 )
 
 @rem
diff --git a/installer/src/main/bin/updateDomain.cmd b/installer/src/main/bin/updateDomain.cmd
@@ -149,8 +149,11 @@ IF NOT "%~1" == "" (
   GOTO arg_loop
 )
 
+SET SCRIPT_ARGS=%*
 @rem Default domain type if not specified
-IF "%DOMAIN_TYPE%"=="" SET DOMAIN_TYPE=WLS
+IF "%DOMAIN_TYPE%"=="" (
+    SET SCRIPT_ARGS=%SCRIPT_ARGS% -domain_type WLS
+)
 
 @rem
 @rem Validate the JVM version based on whether or not the user asked us to use encryption
diff --git a/installer/src/main/bin/validateModel.cmd b/installer/src/main/bin/validateModel.cmd
@@ -160,8 +160,7 @@ IF NOT "%~1" == "" (
 SET SCRIPT_ARGS=%*
 @rem Default domain type if not specified
 IF "%DOMAIN_TYPE%"=="" (
-    SET DOMAIN_TYPE=WLS
-    SET SCRIPT_ARGS=%SCRIPT_ARGS% -domain_type %DOMAIN_TYPE%
+    SET SCRIPT_ARGS=%SCRIPT_ARGS% -domain_type WLS
 )
 @rem
 @rem Check for values of required arguments for this script to continue.

Original file line number	Diff line number	Diff line change
`@@ -154,8 +154,7 @@ IF NOT "%~1" == "" (`
`154`	`154`	`SET SCRIPT_ARGS=%*`
`155`	`155`	`@rem Default domain type if not specified`
`156`	`156`	`IF "%DOMAIN_TYPE%"=="" (`
`157`		`- SET DOMAIN_TYPE=WLS`
`158`		`- SET SCRIPT_ARGS=%SCRIPT_ARGS% -domain_type %DOMAIN_TYPE%`
	`157`	`+ SET SCRIPT_ARGS=%SCRIPT_ARGS% -domain_type WLS`
`159`	`158`	`)`
`160`	`159`
`161`	`160`
Original file line number	Diff line number	Diff line change
`@@ -152,8 +152,7 @@ IF NOT "%~1" == "" (`
`152`	`152`	`SET SCRIPT_ARGS=%*`
`153`	`153`	`@rem Default domain type if not specified`
`154`	`154`	`IF "%DOMAIN_TYPE%"=="" (`
`155`		`- SET DOMAIN_TYPE=WLS`
`156`		`- SET SCRIPT_ARGS=%SCRIPT_ARGS% -domain_type %DOMAIN_TYPE%`
	`155`	`+ SET SCRIPT_ARGS=%SCRIPT_ARGS% -domain_type WLS`
`157`	`156`	`)`
`158`	`157`
`159`	`158`	`@rem`
Original file line number	Diff line number	Diff line change
`@@ -161,8 +161,7 @@ IF NOT "%~1" == "" (`
`161`	`161`	`SET SCRIPT_ARGS=%*`
`162`	`162`	`@rem Default domain type if not specified`
`163`	`163`	`IF "%DOMAIN_TYPE%"=="" (`
`164`		`- SET DOMAIN_TYPE=WLS`
`165`		`- SET SCRIPT_ARGS=%SCRIPT_ARGS% -domain_type %DOMAIN_TYPE%`
	`164`	`+ SET SCRIPT_ARGS=%SCRIPT_ARGS% -domain_type WLS`
`166`	`165`	`)`
`167`	`166`
`168`	`167`	`@rem`
Original file line number	Diff line number	Diff line change
`@@ -170,8 +170,7 @@ IF NOT "%~1" == "" (`
`170`	`170`	`SET SCRIPT_ARGS=%*`
`171`	`171`	`@rem Default domain type if not specified`
`172`	`172`	`IF "%DOMAIN_TYPE%"=="" (`
`173`		`- SET DOMAIN_TYPE=WLS`
`174`		`- SET SCRIPT_ARGS=%SCRIPT_ARGS% -domain_type %DOMAIN_TYPE%`
	`173`	`+ SET SCRIPT_ARGS=%SCRIPT_ARGS% -domain_type WLS`
`175`	`174`	`)`
`176`	`175`
`177`	`176`	`@rem`
Original file line number	Diff line number	Diff line change
`@@ -164,8 +164,7 @@ IF NOT "%~1" == "" (`
`164`	`164`	`SET SCRIPT_ARGS=%*`
`165`	`165`	`@rem Default domain type if not specified`
`166`	`166`	`IF "%DOMAIN_TYPE%"=="" (`
`167`		`- SET DOMAIN_TYPE=WLS`
`168`		`- SET SCRIPT_ARGS=%SCRIPT_ARGS% -domain_type %DOMAIN_TYPE%`
	`167`	`+ SET SCRIPT_ARGS=%SCRIPT_ARGS% -domain_type WLS`
`169`	`168`	`)`
`170`	`169`
`171`	`170`	`@rem`