diff --git a/Agent/kill.cmd b/Agent/kill.cmd index af2c90e5..cb55c458 100755 --- a/Agent/kill.cmd +++ b/Agent/kill.cmd @@ -1,3 +1,3 @@ -cd %~dp0 -taskkill /F /FI "USERNAME eq %username%" /IM orpa-agent.exe +cd %~dp0 +taskkill /F /FI "USERNAME eq %username%" /IM orpa-agent.exe pause >nul \ No newline at end of file diff --git a/Agent/start-daemon.cmd b/Agent/start-daemon.cmd index 6ddca62e..2f29c6e1 100755 --- a/Agent/start-daemon.cmd +++ b/Agent/start-daemon.cmd @@ -1,6 +1,6 @@ -chcp 65001 -cd /d "%~dp0" -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 -.\..\Resources\WPy64-3720\python-3.7.2.amd64\orpa-agent.exe "config.py" +chcp 65001 +cd /d "%~dp0" +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 +.\..\Resources\WPy64-3720\python-3.7.2.amd64\orpa-agent.exe "config.py" pause >nul \ No newline at end of file diff --git a/Agent/start.cmd b/Agent/start.cmd index 16d3de8e..4285578d 100755 --- a/Agent/start.cmd +++ b/Agent/start.cmd @@ -1,6 +1,6 @@ -chcp 65001 -cd /d "%~dp0" -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 -.\..\Resources\WPy64-3720\python-3.7.2.amd64\orpa-agent.exe "config.py" +chcp 65001 +cd /d "%~dp0" +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 +.\..\Resources\WPy64-3720\python-3.7.2.amd64\orpa-agent.exe "config.py" pause >nul \ No newline at end of file diff --git a/Git/Branch_devIvan_master.cmd b/Git/Branch_devIvan_master.cmd index 500d1ad2..4720b680 100644 --- a/Git/Branch_devIvan_master.cmd +++ b/Git/Branch_devIvan_master.cmd @@ -1,9 +1,9 @@ -cd %~dp0 -git push origin devIvan -git checkout master -git reset --hard -git pull -git merge devIvan -git push origin master -git checkout devIvan +cd %~dp0 +git push origin devIvan +git checkout master +git reset --hard +git pull +git merge devIvan +git push origin master +git checkout devIvan pause >nul \ No newline at end of file diff --git a/Git/Clean.cmd b/Git/Clean.cmd index 28a880e6..09a17d5d 100644 --- a/Git/Clean.cmd +++ b/Git/Clean.cmd @@ -1,3 +1,3 @@ -git clean -f -d -git reset --hard +git clean -f -d +git reset --hard pause>nul \ No newline at end of file diff --git a/Git/Pull.cmd b/Git/Pull.cmd index a42221fc..780516cd 100644 --- a/Git/Pull.cmd +++ b/Git/Pull.cmd @@ -1,2 +1,2 @@ -git pull +git pull pause>nul \ No newline at end of file diff --git a/Git/RevisionLastUpdate.cmd b/Git/RevisionLastUpdate.cmd index 378c325e..26d7def1 100644 --- a/Git/RevisionLastUpdate.cmd +++ b/Git/RevisionLastUpdate.cmd @@ -1,4 +1,4 @@ -cd %~dp0 -git reset --hard -git pull +cd %~dp0 +git reset --hard +git pull pause >nul \ No newline at end of file diff --git a/Orchestrator/init-python-env.cmd b/Orchestrator/init-python-env.cmd index aae57995..fabd6526 100644 --- a/Orchestrator/init-python-env.cmd +++ b/Orchestrator/init-python-env.cmd @@ -1,24 +1,24 @@ -chcp 65001 -@echo off -echo Формат использования init-python-env.cmd [имя запускаемого процесса.exe] [имя убиваемого процесса.exe] -echo Пример использования init-python-env.cmd orpa-rbt.exe orpa-rbt.exe - -if [%1]==[] goto :python-env -goto 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" -if [%2]==[] goto :python-env -goto taskkill -:taskkill -taskkill /im "%2" /F /fi "username eq %username%" -goto :python-env -:python-env -set CD_PREV=%cd% -cd /d "%~dp0..\Resources\WPy64-3720\python-3.7.2.amd64" -set PATH=%cd%;%cd%\Scripts;%PATH% -cd /d "%~dp0..\Sources" -set PYTHONPATH=%cd%;%PYTHONPATH% -cd %CD_PREV% -:eof -echo Инициализация Python окружения прошла успешно! +chcp 65001 +@echo off +echo Формат использования init-python-env.cmd [имя запускаемого процесса.exe] [имя убиваемого процесса.exe] +echo Пример использования init-python-env.cmd orpa-rbt.exe orpa-rbt.exe + +if [%1]==[] goto :python-env +goto 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" +if [%2]==[] goto :python-env +goto taskkill +:taskkill +taskkill /im "%2" /F /fi "username eq %username%" +goto :python-env +:python-env +set CD_PREV=%cd% +cd /d "%~dp0..\Resources\WPy64-3720\python-3.7.2.amd64" +set PATH=%cd%;%cd%\Scripts;%PATH% +cd /d "%~dp0..\Sources" +set PYTHONPATH=%cd%;%PYTHONPATH% +cd %CD_PREV% +:eof +echo Инициализация Python окружения прошла успешно! @echo on \ No newline at end of file diff --git a/Orchestrator/start-python-env.cmd b/Orchestrator/start-python-env.cmd index 652bdcbf..aed7bc5b 100644 --- a/Orchestrator/start-python-env.cmd +++ b/Orchestrator/start-python-env.cmd @@ -1,4 +1,4 @@ -chcp 65001 -cd /d "%~dp0" -call init-python-env.cmd orpa-rbt.exe orpa-rbt.exe +chcp 65001 +cd /d "%~dp0" +call init-python-env.cmd orpa-rbt.exe orpa-rbt.exe cmd \ No newline at end of file diff --git a/Orchestrator/start.cmd b/Orchestrator/start.cmd index 6d5c46da..a73c2e8d 100755 --- a/Orchestrator/start.cmd +++ b/Orchestrator/start.cmd @@ -1,5 +1,5 @@ -chcp 65001 -cd /d "%~dp0" -call init-python-env.cmd orpa-orc.exe orpa-orc.exe -orpa-orc.exe "config.py" +chcp 65001 +cd /d "%~dp0" +call init-python-env.cmd orpa-orc.exe orpa-orc.exe +orpa-orc.exe "config.py" pause>nul \ No newline at end of file diff --git a/Studio/start.cmd b/Studio/start.cmd index 630ed554..a961bda4 100644 --- a/Studio/start.cmd +++ b/Studio/start.cmd @@ -1,5 +1,5 @@ -chcp 65001 -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 -.\..\Resources\WPy64-3720\python-3.7.2.amd64\orpa-std.exe -m pyOpenRPA.Studio "..\Studio\config.py" +chcp 65001 +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 +.\..\Resources\WPy64-3720\python-3.7.2.amd64\orpa-std.exe -m pyOpenRPA.Studio "..\Studio\config.py" pause >nul \ No newline at end of file diff --git a/Tools/Jupyter-notebooks/init-nbextension.cmd b/Tools/Jupyter-notebooks/init-nbextension.cmd index 9c77902c..22c5f7e8 100644 --- a/Tools/Jupyter-notebooks/init-nbextension.cmd +++ b/Tools/Jupyter-notebooks/init-nbextension.cmd @@ -1,8 +1,8 @@ -init-python-env.cmd -pip uninstall jupyter-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_contrib_core-0.3.3-py2.py3-none-any.whl" -jupyter contrib nbextension install --user -jupyter nbextension enable Hinterland +init-python-env.cmd +pip uninstall jupyter-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_contrib_core-0.3.3-py2.py3-none-any.whl" +jupyter contrib nbextension install --user +jupyter nbextension enable Hinterland jupyter nbextension enable highlighter \ No newline at end of file diff --git a/Tools/Jupyter-notebooks/init-python-env.cmd b/Tools/Jupyter-notebooks/init-python-env.cmd index 2485ebac..eafce106 100644 --- a/Tools/Jupyter-notebooks/init-python-env.cmd +++ b/Tools/Jupyter-notebooks/init-python-env.cmd @@ -1,24 +1,24 @@ -chcp 65001 -@echo off -echo Формат использования init-python-env.cmd [имя запускаемого процесса.exe] [имя убиваемого процесса.exe] -echo Пример использования init-python-env.cmd orpa-rbt.exe orpa-rbt.exe - -if [%1]==[] goto :python-env -goto 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" -if [%2]==[] goto :python-env -goto taskkill -:taskkill -taskkill /im "%2" /F /fi "username eq %username%" -goto :python-env -:python-env -set CD_PREV=%cd% -cd /d "%~dp0..\..\Resources\WPy64-3720\python-3.7.2.amd64" -set PATH=%cd%;%cd%\Scripts;%PATH% -cd /d "%~dp0..\..\Sources" -set PYTHONPATH=%cd%;%PYTHONPATH% -cd %CD_PREV% -:eof -echo Инициализация Python окружения прошла успешно! +chcp 65001 +@echo off +echo Формат использования init-python-env.cmd [имя запускаемого процесса.exe] [имя убиваемого процесса.exe] +echo Пример использования init-python-env.cmd orpa-rbt.exe orpa-rbt.exe + +if [%1]==[] goto :python-env +goto 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" +if [%2]==[] goto :python-env +goto taskkill +:taskkill +taskkill /im "%2" /F /fi "username eq %username%" +goto :python-env +:python-env +set CD_PREV=%cd% +cd /d "%~dp0..\..\Resources\WPy64-3720\python-3.7.2.amd64" +set PATH=%cd%;%cd%\Scripts;%PATH% +cd /d "%~dp0..\..\Sources" +set PYTHONPATH=%cd%;%PYTHONPATH% +cd %CD_PREV% +:eof +echo Инициализация Python окружения прошла успешно! @echo on \ No newline at end of file diff --git a/Tools/Jupyter-notebooks/start-python-env.cmd b/Tools/Jupyter-notebooks/start-python-env.cmd index 652bdcbf..aed7bc5b 100644 --- a/Tools/Jupyter-notebooks/start-python-env.cmd +++ b/Tools/Jupyter-notebooks/start-python-env.cmd @@ -1,4 +1,4 @@ -chcp 65001 -cd /d "%~dp0" -call init-python-env.cmd orpa-rbt.exe orpa-rbt.exe +chcp 65001 +cd /d "%~dp0" +call init-python-env.cmd orpa-rbt.exe orpa-rbt.exe cmd \ No newline at end of file diff --git a/Tools/Jupyter-notebooks/start.cmd b/Tools/Jupyter-notebooks/start.cmd index 8e6ecb2e..6f9fbd43 100755 --- a/Tools/Jupyter-notebooks/start.cmd +++ b/Tools/Jupyter-notebooks/start.cmd @@ -1,3 +1,3 @@ -chcp 65001 -call init-python-env.cmd jupyter-notebook.exe jupyter-notebook.exe +chcp 65001 +call init-python-env.cmd jupyter-notebook.exe jupyter-notebook.exe jupyter-notebook.exe -m notebook --notebook-dir=%~dp0 \ No newline at end of file