fix unix new line in win cmd files

prd
Ivan Maslov 2 years ago
parent 5b9274570f
commit 28078f8b41

@ -1,3 +1,3 @@
cd %~dp0 cd %~dp0
taskkill /F /FI "USERNAME eq %username%" /IM orpa-agent.exe taskkill /F /FI "USERNAME eq %username%" /IM orpa-agent.exe
pause >nul pause >nul

@ -1,6 +1,6 @@
chcp 65001 chcp 65001
cd /d "%~dp0" cd /d "%~dp0"
taskkill /im "orpa-agent.exe" /F /fi "username eq %username%" taskkill /im "orpa-agent.exe" /F /fi "username eq %username%"
copy /Y ..\Resources\WPy64-3720\python-3.7.2.amd64\pythonw.exe ..\Resources\WPy64-3720\python-3.7.2.amd64\orpa-agent.exe copy /Y ..\Resources\WPy64-3720\python-3.7.2.amd64\pythonw.exe ..\Resources\WPy64-3720\python-3.7.2.amd64\orpa-agent.exe
.\..\Resources\WPy64-3720\python-3.7.2.amd64\orpa-agent.exe "config.py" .\..\Resources\WPy64-3720\python-3.7.2.amd64\orpa-agent.exe "config.py"
pause >nul pause >nul

@ -1,6 +1,6 @@
chcp 65001 chcp 65001
cd /d "%~dp0" cd /d "%~dp0"
taskkill /im "orpa-agent.exe" /F /fi "username eq %username%" taskkill /im "orpa-agent.exe" /F /fi "username eq %username%"
copy /Y ..\Resources\WPy64-3720\python-3.7.2.amd64\python.exe ..\Resources\WPy64-3720\python-3.7.2.amd64\orpa-agent.exe copy /Y ..\Resources\WPy64-3720\python-3.7.2.amd64\python.exe ..\Resources\WPy64-3720\python-3.7.2.amd64\orpa-agent.exe
.\..\Resources\WPy64-3720\python-3.7.2.amd64\orpa-agent.exe "config.py" .\..\Resources\WPy64-3720\python-3.7.2.amd64\orpa-agent.exe "config.py"
pause >nul pause >nul

@ -1,9 +1,9 @@
cd %~dp0 cd %~dp0
git push origin devIvan git push origin devIvan
git checkout master git checkout master
git reset --hard git reset --hard
git pull git pull
git merge devIvan git merge devIvan
git push origin master git push origin master
git checkout devIvan git checkout devIvan
pause >nul pause >nul

@ -1,3 +1,3 @@
git clean -f -d git clean -f -d
git reset --hard git reset --hard
pause>nul pause>nul

@ -1,2 +1,2 @@
git pull git pull
pause>nul pause>nul

@ -1,4 +1,4 @@
cd %~dp0 cd %~dp0
git reset --hard git reset --hard
git pull git pull
pause >nul pause >nul

@ -1,24 +1,24 @@
chcp 65001 chcp 65001
@echo off @echo off
echo Формат использования init-python-env.cmd [имя запускаемого процесса.exe] [имя убиваемого процесса.exe] echo Формат использования init-python-env.cmd [имя запускаемого процесса.exe] [имя убиваемого процесса.exe]
echo Пример использования init-python-env.cmd orpa-rbt.exe orpa-rbt.exe echo Пример использования init-python-env.cmd orpa-rbt.exe orpa-rbt.exe
if [%1]==[] goto :python-env if [%1]==[] goto :python-env
goto create-exe goto create-exe
:create-exe :create-exe
copy /Y "%~dp0..\Resources\WPy64-3720\python-3.7.2.amd64\python.exe" "%~dp0..\Resources\WPy64-3720\python-3.7.2.amd64\%1" copy /Y "%~dp0..\Resources\WPy64-3720\python-3.7.2.amd64\python.exe" "%~dp0..\Resources\WPy64-3720\python-3.7.2.amd64\%1"
if [%2]==[] goto :python-env if [%2]==[] goto :python-env
goto taskkill goto taskkill
:taskkill :taskkill
taskkill /im "%2" /F /fi "username eq %username%" taskkill /im "%2" /F /fi "username eq %username%"
goto :python-env goto :python-env
:python-env :python-env
set CD_PREV=%cd% set CD_PREV=%cd%
cd /d "%~dp0..\Resources\WPy64-3720\python-3.7.2.amd64" cd /d "%~dp0..\Resources\WPy64-3720\python-3.7.2.amd64"
set PATH=%cd%;%cd%\Scripts;%PATH% set PATH=%cd%;%cd%\Scripts;%PATH%
cd /d "%~dp0..\Sources" cd /d "%~dp0..\Sources"
set PYTHONPATH=%cd%;%PYTHONPATH% set PYTHONPATH=%cd%;%PYTHONPATH%
cd %CD_PREV% cd %CD_PREV%
:eof :eof
echo Инициализация Python окружения прошла успешно! echo Инициализация Python окружения прошла успешно!
@echo on @echo on

@ -1,4 +1,4 @@
chcp 65001 chcp 65001
cd /d "%~dp0" cd /d "%~dp0"
call init-python-env.cmd orpa-rbt.exe orpa-rbt.exe call init-python-env.cmd orpa-rbt.exe orpa-rbt.exe
cmd cmd

@ -1,5 +1,5 @@
chcp 65001 chcp 65001
cd /d "%~dp0" cd /d "%~dp0"
call init-python-env.cmd orpa-orc.exe orpa-orc.exe call init-python-env.cmd orpa-orc.exe orpa-orc.exe
orpa-orc.exe "config.py" orpa-orc.exe "config.py"
pause>nul pause>nul

@ -1,5 +1,5 @@
chcp 65001 chcp 65001
cd /d "%~dp0\..\Sources" cd /d "%~dp0\..\Sources"
copy /Y ..\Resources\WPy64-3720\python-3.7.2.amd64\python.exe ..\Resources\WPy64-3720\python-3.7.2.amd64\orpa-std.exe copy /Y ..\Resources\WPy64-3720\python-3.7.2.amd64\python.exe ..\Resources\WPy64-3720\python-3.7.2.amd64\orpa-std.exe
.\..\Resources\WPy64-3720\python-3.7.2.amd64\orpa-std.exe -m pyOpenRPA.Studio "..\Studio\config.py" .\..\Resources\WPy64-3720\python-3.7.2.amd64\orpa-std.exe -m pyOpenRPA.Studio "..\Studio\config.py"
pause >nul pause >nul

@ -1,8 +1,8 @@
init-python-env.cmd init-python-env.cmd
pip uninstall jupyter-core pip uninstall jupyter-core
pip uninstall jupyter-contrib-core pip uninstall jupyter-contrib-core
pip install "..\..\Resources\PyPackages\jupyter_core-4.6.3-py2.py3-none-any.whl" pip install "..\..\Resources\PyPackages\jupyter_core-4.6.3-py2.py3-none-any.whl"
pip install "..\..\Resources\PyPackages\jupyter_contrib_core-0.3.3-py2.py3-none-any.whl" pip install "..\..\Resources\PyPackages\jupyter_contrib_core-0.3.3-py2.py3-none-any.whl"
jupyter contrib nbextension install --user jupyter contrib nbextension install --user
jupyter nbextension enable Hinterland jupyter nbextension enable Hinterland
jupyter nbextension enable highlighter jupyter nbextension enable highlighter

@ -1,24 +1,24 @@
chcp 65001 chcp 65001
@echo off @echo off
echo Формат использования init-python-env.cmd [имя запускаемого процесса.exe] [имя убиваемого процесса.exe] echo Формат использования init-python-env.cmd [имя запускаемого процесса.exe] [имя убиваемого процесса.exe]
echo Пример использования init-python-env.cmd orpa-rbt.exe orpa-rbt.exe echo Пример использования init-python-env.cmd orpa-rbt.exe orpa-rbt.exe
if [%1]==[] goto :python-env if [%1]==[] goto :python-env
goto create-exe goto create-exe
:create-exe :create-exe
copy /Y "%~dp0..\..\Resources\WPy64-3720\python-3.7.2.amd64\python.exe" "%~dp0..\..\Resources\WPy64-3720\python-3.7.2.amd64\%1" copy /Y "%~dp0..\..\Resources\WPy64-3720\python-3.7.2.amd64\python.exe" "%~dp0..\..\Resources\WPy64-3720\python-3.7.2.amd64\%1"
if [%2]==[] goto :python-env if [%2]==[] goto :python-env
goto taskkill goto taskkill
:taskkill :taskkill
taskkill /im "%2" /F /fi "username eq %username%" taskkill /im "%2" /F /fi "username eq %username%"
goto :python-env goto :python-env
:python-env :python-env
set CD_PREV=%cd% set CD_PREV=%cd%
cd /d "%~dp0..\..\Resources\WPy64-3720\python-3.7.2.amd64" cd /d "%~dp0..\..\Resources\WPy64-3720\python-3.7.2.amd64"
set PATH=%cd%;%cd%\Scripts;%PATH% set PATH=%cd%;%cd%\Scripts;%PATH%
cd /d "%~dp0..\..\Sources" cd /d "%~dp0..\..\Sources"
set PYTHONPATH=%cd%;%PYTHONPATH% set PYTHONPATH=%cd%;%PYTHONPATH%
cd %CD_PREV% cd %CD_PREV%
:eof :eof
echo Инициализация Python окружения прошла успешно! echo Инициализация Python окружения прошла успешно!
@echo on @echo on

@ -1,4 +1,4 @@
chcp 65001 chcp 65001
cd /d "%~dp0" cd /d "%~dp0"
call init-python-env.cmd orpa-rbt.exe orpa-rbt.exe call init-python-env.cmd orpa-rbt.exe orpa-rbt.exe
cmd cmd

@ -1,3 +1,3 @@
chcp 65001 chcp 65001
call init-python-env.cmd jupyter-notebook.exe jupyter-notebook.exe call init-python-env.cmd jupyter-notebook.exe jupyter-notebook.exe
jupyter-notebook.exe -m notebook --notebook-dir=%~dp0 jupyter-notebook.exe -m notebook --notebook-dir=%~dp0
Loading…
Cancel
Save