Correction suite à workflow failed

Author: souadbenmustapha

_build.bat

@@ -25,34 +25,22 @@ IF EXIST "%input_cache_path%%publisher_jar%" (
     ) ELSE (
         SET "jar_location=not_found"
         SET "default_choice=1"
-        SET "default_reason=publisher not found"
         ECHO publisher.jar not found in input-cache or parent folder
     )
 )
 
 
 :: Handle command-line argument to bypass the menu
-:: Known first arguments select a menu option; anything else is passed through to the publisher
-SET "extraArgs="
-IF "%~1"=="" GOTO showMenu
-IF /I "%~1"=="update" SET "userChoice=1" & GOTO parseExtra
-IF /I "%~1"=="build" SET "userChoice=2" & GOTO parseExtra
-IF /I "%~1"=="nosushi" SET "userChoice=3" & GOTO parseExtra
-IF /I "%~1"=="notx" SET "userChoice=4" & GOTO parseExtra
-IF /I "%~1"=="jekyll" SET "userChoice=5" & GOTO parseExtra
-IF /I "%~1"=="clean" SET "userChoice=6" & GOTO parseExtra
-IF /I "%~1"=="exit" SET "userChoice=0" & GOTO parseExtra
-:: Unknown first arg - default to build, pass all args through
-SET "userChoice=2"
-GOTO collectArgs
-:parseExtra
-SHIFT
-:collectArgs
-IF "%~1"=="" GOTO executeChoice
-SET "extraArgs=!extraArgs! %1"
-SHIFT
-GOTO collectArgs
-:showMenu
+IF NOT "%~1"=="" (
+    IF /I "%~1"=="update" SET "userChoice=1"
+    IF /I "%~1"=="build" SET "userChoice=2"
+    IF /I "%~1"=="nosushi" SET "userChoice=3"
+    IF /I "%~1"=="notx" SET "userChoice=4"
+    IF /I "%~1"=="jekyll" SET "userChoice=5"
+    IF /I "%~1"=="clean" SET "userChoice=6"
+    IF /I "%~1"=="exit" SET "userChoice=0"
+    GOTO executeChoice
+)
 
 echo ---------------------------------------------------------------
 ECHO Checking internet connection...
@@ -65,14 +53,10 @@ IF "%online_status%"=="true" (
     SET "latest_version=!latest_version: =!"
     SET "latest_version=!latest_version:~0,-1!"
 ) ELSE (
-    ECHO.
-    ECHO *** WARNING: Working offline - this is not the normal mode.
-    ECHO     Some features (e.g. terminology rendering) will not work.
-    ECHO.
+    ECHO We're offline or tx.fhir.org is not available, can only run the publisher without TX...
     SET "txoption=-tx n/a"
     SET "latest_version=unknown"
     SET "default_choice=4"
-    SET "default_reason=working offline"
 )
 
 echo ---------------------------------------------------------------
@@ -95,11 +79,9 @@ IF NOT "%online_status%"=="true" (
     IF NOT "!publisher_version!"=="!latest_version!" (
         ECHO An update is recommended.
         SET "default_choice=1"
-        SET "default_reason=newer version available"
     ) ELSE (
         ECHO Publisher is up to date.
         SET "default_choice=2"
-        SET "default_reason=publisher is up to date"
     )
 )
 
@@ -114,9 +96,12 @@ echo 4. Build IG - force no TX server
 echo 5. Jekyll build
 echo 6. Clean up temp directories
 echo 0. Exit
+:: echo [Press Enter for default (%default_choice%) or type an option number:]
 echo.
 
-choice /C 12345670 /N /CS /D %default_choice% /T 5 /M "Choose an option number or wait 5 seconds for default (%default_choice% - %default_reason%):"
+:: Using CHOICE to handle input with timeout
+:: ECHO [Enter=Continue, 1-7=Option, 0=Exit]
+choice /C 12345670 /N /CS /D %default_choice% /T 5 /M "Choose an option number or wait 5 seconds for default (%default_choice%):"
 SET "userChoice=%ERRORLEVEL%"
 
 
@@ -130,12 +115,15 @@ IF "%userChoice%"=="4" GOTO publish_notx
 IF "%userChoice%"=="5" GOTO debugjekyll
 IF "%userChoice%"=="6" GOTO clean
 IF "%userChoice%"=="0" EXIT /B
-GOTO endscript
+
+:end
+
+
 
 :debugjekyll
     echo Running Jekyll build...
     jekyll build -s temp/pages -d output
-GOTO endscript
+GOTO end
 
 
 :clean
@@ -164,7 +152,10 @@ GOTO endscript
         echo Removed: .\template
     )
 
-GOTO endscript
+GOTO end
+
+
+
 
 
 :downloadpublisher
@@ -207,7 +198,7 @@ IF DEFINED FORCE (
 	GOTO download
 )
 
-IF "%skipPrompts%"=="true" (
+IF "%skipPrompts%"=="y" (
 	SET create=Y
 ) ELSE (
 	SET /p create="Download? (Y/N) "
@@ -220,7 +211,7 @@ IF /I "%create%"=="Y" (
 GOTO done
 
 :upgrade
-IF "%skipPrompts%"=="true" (
+IF "%skipPrompts%"=="y" (
 	SET overwrite=Y
 ) ELSE (
 	SET /p overwrite="Overwrite %jarlocation%? (Y/N) "
@@ -274,15 +265,15 @@ GOTO done
 
 ECHO.
 ECHO Updating scripts
-IF "%skipPrompts%"=="true" (
+IF "%skipPrompts%"=="y" (
 	SET updateScripts=Y
 ) ELSE (
 	SET /p updateScripts="Update scripts? (Y/N) "
 )
 IF /I "%updateScripts%"=="Y" (
 	GOTO scripts
 )
-GOTO endscript
+GOTO end
 
 
 :scripts
@@ -308,28 +299,27 @@ ECHO Updating _build.bat
 call POWERSHELL -command if ('System.Net.WebClient' -as [type]) {(new-object System.Net.WebClient).DownloadFile(\"%build_bat_url%\",\"_build.new.bat\") } else { Invoke-WebRequest -Uri "%build_bat_url%" -Outfile "_build.new.bat" }
 if %ERRORLEVEL% == 0 goto upd_script_2
 echo "Errors encountered during download: %errorlevel%"
-goto endscript
+goto end
 :upd_script_2
 start copy /y "_build.new.bat" "_build.bat" ^&^& del "_build.new.bat" ^&^& exit
 
 
-GOTO endscript
+GOTO end
 
 
 :publish_once
 
 SET JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
 
 :: Debugging statements before running publisher
-ECHO jar_location is: %jar_location%
+ECHO 1jar_location is: %jar_location%
 IF NOT "%jar_location%"=="not_found" (
-	ECHO IG Publisher FOUND, Publishing...
-	java %JAVA_OPTS% -jar "%jar_location%" -ig . %txoption% %extraArgs%
+	java %JAVA_OPTS% -jar "%jar_location%" -ig . %txoption% %*
 ) ELSE (
 	ECHO IG Publisher NOT FOUND in input-cache or parent folder.  Please run _updatePublisher.  Aborting...
 )
 
-GOTO endscript
+GOTO end
 
 
 
@@ -338,14 +328,14 @@ GOTO endscript
 SET JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
 
 :: Debugging statements before running publisher
-ECHO jar_location is: %jar_location%
+ECHO 3jar_location is: %jar_location%
 IF NOT "%jar_location%"=="not_found" (
-	java %JAVA_OPTS% -jar "%jar_location%" -ig . %txoption% -no-sushi %extraArgs%
+	java %JAVA_OPTS% -jar "%jar_location%" -ig . %txoption% -no-sushi %*
 ) ELSE (
 	ECHO IG Publisher NOT FOUND in input-cache or parent folder. Please run _updatePublisher.  Aborting...
 )
 
-GOTO endscript
+GOTO end
 
 
 :publish_notx
@@ -354,33 +344,43 @@ SET txoption=-tx n/a
 SET JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
 
 :: Debugging statements before running publisher
-ECHO jar_location is: %jar_location%
+ECHO 2jar_location is: %jar_location%
 IF NOT "%jar_location%"=="not_found" (
-	java %JAVA_OPTS% -jar "%jar_location%" -ig . %txoption% %extraArgs%
+	java %JAVA_OPTS% -jar "%jar_location%" -ig . %txoption% %*
 ) ELSE (
 	ECHO IG Publisher NOT FOUND in input-cache or parent folder.  Please run _updatePublisher.  Aborting...
 )
 
-GOTO endscript
+GOTO end
+
+
 
 
 :publish_continuous
 
 SET JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
 
-ECHO jar_location is: %jar_location%
-IF NOT "%jar_location%"=="not_found" (
-	java %JAVA_OPTS% -jar "%jar_location%" -ig . %txoption% -watch %extraArgs%
+:: Debugging statements before running publisher
+ECHO Checking %input_cache_path% for publisher.jar
+IF EXIST "%input_cache_path%\%publisher_jar%" (
+	java %JAVA_OPTS% -jar "%input_cache_path%\%publisher_jar%" -ig . %txoption% -watch %*
 ) ELSE (
-	ECHO IG Publisher NOT FOUND in input-cache or parent folder.  Please run _updatePublisher.  Aborting...
+    ECHO Checking %upper_path% for publisher.jar
+    IF EXIST "..\%publisher_jar%" (
+	    java %JAVA_OPTS% -jar "..\%publisher_jar%" -ig . %txoption% -watch %*
+    ) ELSE (
+	    ECHO IG Publisher NOT FOUND in input-cache or parent folder.  Please run _updatePublisher.  Aborting...
+    )
 )
 
-GOTO endscript
+GOTO end
 
 
-:endscript
+:end
 
 :: Pausing at the end
+
+
 IF NOT "%skipPrompts%"=="true" (
   PAUSE
 )