Move file with no extension variable assignment before it's used

hairyhum · hairyhum · commit bcdd78881966 · 2018-08-14T14:19:42.000+01:00
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
@@ -112,6 +112,8 @@ if "!RABBITMQ_CONFIG_FILE_NOEX!.config" == "!RABBITMQ_CONFIG_FILE" (
     )
 )
 
+CALL :get_noex !RABBITMQ_CONFIG_ARG_FILE! RABBITMQ_CONFIG_ARG_FILE_NOEX
+
 if not "$!RABBITMQ_CONFIG_ARG_FILE_NOEX!.config" == "!RABBITMQ_CONFIG_ARG_FILE!" (
     if "!RABBITMQ_CONFIG_ARG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE!" (
         echo "ERROR: Wrong extension for RABBITMQ_ADVANCED_CONFIG_FILE: !RABBITMQ_ADVANCED_CONFIG_FILE!"
@@ -127,7 +129,6 @@ if not "$!RABBITMQ_CONFIG_ARG_FILE_NOEX!.config" == "!RABBITMQ_CONFIG_ARG_FILE!"
 
 rem Set -config if the file exists
 if exist !RABBITMQ_CONFIG_ARG_FILE! (
-    CALL :get_noex !RABBITMQ_CONFIG_ARG_FILE! RABBITMQ_CONFIG_ARG_FILE_NOEX
     set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_ARG_FILE_NOEX!"
 )
 
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
@@ -195,6 +195,8 @@ if "!RABBITMQ_CONFIG_FILE_NOEX!.config" == "!RABBITMQ_CONFIG_FILE" (
     )
 )
 
+CALL :get_noex !RABBITMQ_CONFIG_ARG_FILE! RABBITMQ_CONFIG_ARG_FILE_NOEX
+
 if not "$!RABBITMQ_CONFIG_ARG_FILE_NOEX!.config" == "!RABBITMQ_CONFIG_ARG_FILE!" (
     if "!RABBITMQ_CONFIG_ARG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE!" (
         echo "ERROR: Wrong extension for RABBITMQ_ADVANCED_CONFIG_FILE: !RABBITMQ_ADVANCED_CONFIG_FILE!"
@@ -210,7 +212,6 @@ if not "$!RABBITMQ_CONFIG_ARG_FILE_NOEX!.config" == "!RABBITMQ_CONFIG_ARG_FILE!"
 
 rem Set -config if the file exists
 if exist !RABBITMQ_CONFIG_ARG_FILE! (
-    CALL :get_noex !RABBITMQ_CONFIG_ARG_FILE! RABBITMQ_CONFIG_ARG_FILE_NOEX
     set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_ARG_FILE_NOEX!"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,8 @@ if "!RABBITMQ_CONFIG_FILE_NOEX!.config" == "!RABBITMQ_CONFIG_FILE" (`
`112`	`112`	`)`
`113`	`113`	`)`
`114`	`114`
	`115`	`+CALL :get_noex !RABBITMQ_CONFIG_ARG_FILE! RABBITMQ_CONFIG_ARG_FILE_NOEX`
	`116`	`+`
`115`	`117`	`if not "$!RABBITMQ_CONFIG_ARG_FILE_NOEX!.config" == "!RABBITMQ_CONFIG_ARG_FILE!" (`
`116`	`118`	`if "!RABBITMQ_CONFIG_ARG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE!" (`
`117`	`119`	`echo "ERROR: Wrong extension for RABBITMQ_ADVANCED_CONFIG_FILE: !RABBITMQ_ADVANCED_CONFIG_FILE!"`
`@@ -127,7 +129,6 @@ if not "$!RABBITMQ_CONFIG_ARG_FILE_NOEX!.config" == "!RABBITMQ_CONFIG_ARG_FILE!"`
`127`	`129`
`128`	`130`	`rem Set -config if the file exists`
`129`	`131`	`if exist !RABBITMQ_CONFIG_ARG_FILE! (`
`130`		`- CALL :get_noex !RABBITMQ_CONFIG_ARG_FILE! RABBITMQ_CONFIG_ARG_FILE_NOEX`
`131`	`132`	`set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_ARG_FILE_NOEX!"`
`132`	`133`	`)`
`133`	`134`
Original file line number	Diff line number	Diff line change
`@@ -195,6 +195,8 @@ if "!RABBITMQ_CONFIG_FILE_NOEX!.config" == "!RABBITMQ_CONFIG_FILE" (`
`195`	`195`	`)`
`196`	`196`	`)`
`197`	`197`
	`198`	`+CALL :get_noex !RABBITMQ_CONFIG_ARG_FILE! RABBITMQ_CONFIG_ARG_FILE_NOEX`
	`199`	`+`
`198`	`200`	`if not "$!RABBITMQ_CONFIG_ARG_FILE_NOEX!.config" == "!RABBITMQ_CONFIG_ARG_FILE!" (`
`199`	`201`	`if "!RABBITMQ_CONFIG_ARG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE!" (`
`200`	`202`	`echo "ERROR: Wrong extension for RABBITMQ_ADVANCED_CONFIG_FILE: !RABBITMQ_ADVANCED_CONFIG_FILE!"`
`@@ -210,7 +212,6 @@ if not "$!RABBITMQ_CONFIG_ARG_FILE_NOEX!.config" == "!RABBITMQ_CONFIG_ARG_FILE!"`
`210`	`212`
`211`	`213`	`rem Set -config if the file exists`
`212`	`214`	`if exist !RABBITMQ_CONFIG_ARG_FILE! (`
`213`		`- CALL :get_noex !RABBITMQ_CONFIG_ARG_FILE! RABBITMQ_CONFIG_ARG_FILE_NOEX`
`214`	`215`	`set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_ARG_FILE_NOEX!"`
`215`	`216`	`)`
`216`	`217`