Reordered sections

This commit is contained in:
Alan Mason 2017-11-22 13:48:07 -08:00
parent e28492f32f
commit a6d991ca60

View file

@ -165,33 +165,6 @@ if "%_odt%" == "True" (
)
goto Exit
:LaunchQuickBooksSetup
rem set args and copy setup files to system
rem NOTE: init_client_dir.cmd sets %client_dir% and creates %client_dir%\QuickBooks folder
call "%bin%\Scripts\init_client_dir.cmd" /QuickBooks
echo Copying setup file(s) for %L_ITEM%...
rem copy setup files from QUICKBOOKS_SERVER_IP
set "fastcopy_args=/cmd=diff /no_ui /auto_close"
set "product=%L_PATH%\%L_ITEM%"
set "product_name=%L_ITEM%"
call :GetBasename product_name || goto ErrorBasename
set "source=\\%QUICKBOOKS_SERVER_IP%\QuickBooks\!product!"
set "dest=%client_dir%\QuickBooks"
rem Verify source
if not exist "!source!" (goto ErrorQuickBooksSourceNotFound)
rem Copy setup file(s) to system
start "" /wait "%FASTCOPY%" !fastcopy_args! "!source!" /to="!dest!\"
rem Run setup
if exist "!dest!\!product_name!\Setup.exe" (
pushd "!dest!\!product_name!"
start "" "!dest!\!product_name!\Setup.exe" || goto ErrorUnknown
popd
) else (
rem QuickBooks source not supported by this script
goto ErrorQuickBooksUnsupported
)
goto Exit
:LaunchProgram
rem Test L_PATH and set %_path%
call :TestPath || goto ErrorProgramNotFound
@ -274,6 +247,33 @@ if defined L_ELEV (
)
goto Exit
:LaunchQuickBooksSetup
rem set args and copy setup files to system
rem NOTE: init_client_dir.cmd sets %client_dir% and creates %client_dir%\QuickBooks folder
call "%bin%\Scripts\init_client_dir.cmd" /QuickBooks
echo Copying setup file(s) for %L_ITEM%...
rem copy setup files from QUICKBOOKS_SERVER_IP
set "fastcopy_args=/cmd=diff /no_ui /auto_close"
set "product=%L_PATH%\%L_ITEM%"
set "product_name=%L_ITEM%"
call :GetBasename product_name || goto ErrorBasename
set "source=\\%QUICKBOOKS_SERVER_IP%\QuickBooks\!product!"
set "dest=%client_dir%\QuickBooks"
rem Verify source
if not exist "!source!" (goto ErrorQuickBooksSourceNotFound)
rem Copy setup file(s) to system
start "" /wait "%FASTCOPY%" !fastcopy_args! "!source!" /to="!dest!\"
rem Run setup
if exist "!dest!\!product_name!\Setup.exe" (
pushd "!dest!\!product_name!"
start "" "!dest!\!product_name!\Setup.exe" || goto ErrorUnknown
popd
) else (
rem QuickBooks source not supported by this script
goto ErrorQuickBooksUnsupported
)
goto Exit
:Usage
echo.
echo.Usage (via defined variables):