From 2e5ae32331fef93389e44c1b4285849a77253777 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Sun, 13 Sep 2020 07:07:01 -0400 Subject: [PATCH] move main laragon cmder logic to laragon/etc/cmder --- bin/cmder/config/profile.d/laragon.cmd | 55 +------------------------- etc/cmder/laragon.cmd | 51 ++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 53 deletions(-) create mode 100644 etc/cmder/laragon.cmd diff --git a/bin/cmder/config/profile.d/laragon.cmd b/bin/cmder/config/profile.d/laragon.cmd index 600be3e1..f001747c 100644 --- a/bin/cmder/config/profile.d/laragon.cmd +++ b/bin/cmder/config/profile.d/laragon.cmd @@ -1,56 +1,5 @@ @echo off -echo %CMDER_ROOT% | findstr /i "\laragon\bin\cmder" -if "%ERRORLEVEL%" equ "0" call :laragon -exit /b 0 - -:laragon - :: Laragon Start ------------------------------------------------------------------- - - if exist "%CMDER_ROOT%\..\git" ( - set "GIT_INSTALL_ROOT=%CMDER_ROOT%\..\git" - ) - - if exist "%GIT_INSTALL_ROOT%\post-install.bat" ( - echo Running Git for Windows one time Post Install.... - pushd "%GIT_INSTALL_ROOT%" - call "%GIT_INSTALL_ROOT%\git-bash.exe" --no-needs-console --hide --no-cd --command=post-install.bat - @DEL post-install.bat - - popd - :: cd /d %USERPROFILE% - rem - ) - - for /f "delims=" %%i in ("%CMDER_ROOT%\..\..\usr") do set USER_DIR=%%~fi - set USR_DIR=%USER_DIR% - - if exist "%CMDER_ROOT%\..\laragon\laragon.cmd" ( - :: call Laragon own commands - call "%CMDER_ROOT%\..\laragon\laragon.cmd" - ) - - - if exist "%USER_DIR%\user.cmd" ( - rem create this file and place your own command in there - call "%USER_DIR%\user.cmd" - ) else ( - echo Creating user startup file: "%USER_DIR%\user.cmd" - ( - echo :: use this file to run your own startup commands - echo :: use in front of the command to prevent printing the command - echo. - echo :: call start-ssh-agent.cmd - echo :: set PATH=%%USER_DIR%%\bin\whatever;%%PATH%% - echo. - echo :: cmd /c start http://localhost - echo. - ) > "%USER_DIR%\user.cmd" - - :: cd /d "%CMDER_ROOT%\..\..\www" - rem - ) - - :: Laragon End ------------------------------------------------------------------- - +echo %CMDER_ROOT% | findstr /i "\laragon\bin\cmder" >nul +if "%ERRORLEVEL%" equ "0" call %cmder_root%\..\..\etc\cmder\laragon.cmd exit /b 0 diff --git a/etc/cmder/laragon.cmd b/etc/cmder/laragon.cmd new file mode 100644 index 00000000..08ae0429 --- /dev/null +++ b/etc/cmder/laragon.cmd @@ -0,0 +1,51 @@ +@echo off + +:: Laragon Start ------------------------------------------------------------------- + +if exist "%CMDER_ROOT%\..\git" ( + set "GIT_INSTALL_ROOT=%CMDER_ROOT%\..\git" +) + +if exist "%GIT_INSTALL_ROOT%\post-install.bat" ( + echo Running Git for Windows one time Post Install.... + pushd "%GIT_INSTALL_ROOT%" + call "%GIT_INSTALL_ROOT%\git-bash.exe" --no-needs-console --hide --no-cd --command=post-install.bat + @DEL post-install.bat + + popd + :: cd /d %USERPROFILE% + rem +) + +for /f "delims=" %%i in ("%CMDER_ROOT%\..\..\usr") do set USER_DIR=%%~fi +set USR_DIR=%USER_DIR% + +if exist "%CMDER_ROOT%\..\laragon\laragon.cmd" ( + :: call Laragon own commands + call "%CMDER_ROOT%\..\laragon\laragon.cmd" +) + + +if exist "%USER_DIR%\user.cmd" ( + rem create this file and place your own command in there + call "%USER_DIR%\user.cmd" +) else ( + echo Creating user startup file: "%USER_DIR%\user.cmd" + ( + echo :: use this file to run your own startup commands + echo :: use in front of the command to prevent printing the command + echo. + echo :: call start-ssh-agent.cmd + echo :: set PATH=%%USER_DIR%%\bin\whatever;%%PATH%% + echo. + echo :: cmd /c start http://localhost + echo. + ) > "%USER_DIR%\user.cmd" + + :: cd /d "%CMDER_ROOT%\..\..\www" + rem +) + +:: Laragon End ------------------------------------------------------------------- + +exit /b 0