From d2847c43f232352f2ad8aecedc0ddb7e15b0b590 Mon Sep 17 00:00:00 2001 From: Ivan Maslov Date: Tue, 1 Nov 2022 10:57:34 +0300 Subject: [PATCH 1/3] fix unix LF --- Agent/kill.cmd | 4 +- Agent/start-daemon.cmd | 10 +- Agent/start.cmd | 10 +- Orchestrator/start.cmd | 6 +- Scripts/Branch_devIvan_master.cmd | 16 ++-- Scripts/Clean.cmd | 4 +- Scripts/Pull.cmd | 2 +- Scripts/PythonWinConfigure.cmd | 148 +++++++++++++++--------------- Scripts/PythonWinInit.cmd | 46 +++++----- Scripts/RevisionLastUpdate.cmd | 6 +- Studio/start.cmd | 8 +- 11 files changed, 130 insertions(+), 130 deletions(-) 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/Orchestrator/start.cmd b/Orchestrator/start.cmd index 0a516c5d..0ea26119 100755 --- a/Orchestrator/start.cmd +++ b/Orchestrator/start.cmd @@ -1,4 +1,4 @@ -chcp 65001 -cd /d "%~dp0" -call .\..\Scripts\PythonWinInit.cmd script orpa-orc.exe orpa-orc.exe +chcp 65001 +cd /d "%~dp0" +call .\..\Scripts\PythonWinInit.cmd script orpa-orc.exe orpa-orc.exe orpa-orc.exe "config.py" \ No newline at end of file diff --git a/Scripts/Branch_devIvan_master.cmd b/Scripts/Branch_devIvan_master.cmd index 500d1ad2..4720b680 100644 --- a/Scripts/Branch_devIvan_master.cmd +++ b/Scripts/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/Scripts/Clean.cmd b/Scripts/Clean.cmd index 28a880e6..09a17d5d 100644 --- a/Scripts/Clean.cmd +++ b/Scripts/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/Scripts/Pull.cmd b/Scripts/Pull.cmd index a42221fc..780516cd 100644 --- a/Scripts/Pull.cmd +++ b/Scripts/Pull.cmd @@ -1,2 +1,2 @@ -git pull +git pull pause>nul \ No newline at end of file diff --git a/Scripts/PythonWinConfigure.cmd b/Scripts/PythonWinConfigure.cmd index fab9e5c1..27593cfb 100644 --- a/Scripts/PythonWinConfigure.cmd +++ b/Scripts/PythonWinConfigure.cmd @@ -1,75 +1,75 @@ -chcp 65001 -if [%1]==[echo_on] goto :program -:echo_no -set TEMP_ECHO_NO=TRUE -@echo off -:program -if NOT "%PYTHON_CONFIGURE%"=="" goto :echo_check -set PYTHON_CONFIGURE=%~f0 -set CD_PREV=%cd% -rem "%~dp0..\Resources" - УСТАНОВКА ПУТИ ОТ РАСПОЛОЖЕНИЯ ФАЙЛА, В КОТОРОМ НАПИСАН ЭТОТ ТЕКСТ. ВНИМАНИЕ! ПОСЛЕ %~dp0 СИМВОЛ \ СТАВИТЬ НЕ ТРЕБУЕТСЯ -rem "%cd%\..\Resources" - УСТАНОВКА ПУТИ ОТ РАБОЧЕЙ ДИРЕКТОРИИ, В КОТОРОЙ БЫЛ ВЫЗВАН ЭТОТ СКРИПТ. ВНИМАНИЕ! ПОСЛЕ %cd% СИМВОЛ \ СТАВИТЬ ТРЕБУЕТСЯ ОБЯЗАТЕЛЬНО -rem Пример использования python-win-configure.cmd python - выполнить команду python в настроенном окружении - -goto comment_set_path -rem ПРИМЕР КОНСТРУКЦИИ ДЛЯ ДОБАВЛЕНИЯ ДИРЕКТОРИИ В ПЕРЕМЕННУЮ ОКРУЖЕНИЯ PATH -set TEMP_LOCATION="%~dp0..\Resources\WPy64-3720\python-3.7.2.amd64" -cd /d %TEMP_LOCATION% -set PATH=%cd%;%PATH% -rem ВНИМАНИЕ! ЗНАК = ДОЛЖЕН БЫТЬ УСТАНОВЛЕН ВПРИТЫК С ПЕРЕМЕННОЙ ОКРУЖЕНИЯ И ЗНАЧЕНИЕМ - ИНАЧЕ УСТАНОВКА ЗНАЧЕНИЯ БУДЕТ ПРОИЗВЕДЕНА НЕКОРРЕКТНО -:comment_set_path - -goto comment_set_pythonpath -rem ПРИМЕР КОНСТРУКЦИИ ДЛЯ ДОБАВЛЕНИЯ ДИРЕКТОРИИ В ПЕРЕМЕННУЮ ОКРУЖЕНИЯ PYTHONPATH -set TEMP_LOCATION="%~dp0..\Sources" -cd /d %TEMP_LOCATION% -set PYTHONPATH=%cd%;%PYTHONPATH% -rem ВНИМАНИЕ! ЗНАК = ДОЛЖЕН БЫТЬ УСТАНОВЛЕН ВПРИТЫК С ПЕРЕМЕННОЙ ОКРУЖЕНИЯ И ЗНАЧЕНИЕМ - ИНАЧЕ УСТАНОВКА ЗНАЧЕНИЯ БУДЕТ ПРОИЗВЕДЕНА НЕКОРРЕКТНО -:comment_set_pythonpath - -rem ЗОНА УСТАНОВКИ ПЕРЕМЕННЫХ ОКРУЖЕНИЯ! -:configure -set TEMP_LOCATION="%~dp0..\Resources\WPy64-3720\python-3.7.2.amd64\Scripts" -cd /d %TEMP_LOCATION% -set PATH=%cd%;%PATH% - -set TEMP_LOCATION="%~dp0..\Resources\WPy64-3720\python-3.7.2.amd64" -cd /d %TEMP_LOCATION% -set PATH=%cd%;%PATH% - -set TEMP_LOCATION="%~dp0..\Sources" -cd /d %TEMP_LOCATION% -set PYTHONPATH=%cd%;%PYTHONPATH% - -rem восстановление каталога рабочей директории программы -cd /d %CD_PREV% - -rem выполнить вызов, если есть параметры, начиная с %2+ -if "%1"=="" goto :echo_check -set ORPA_ARGV= -rem один shift - все параметры, начиная с %2 (или с %1, если не echo_on) -if "%1"=="echo_on" shift -:loop1 -if "%1"=="" goto after_loop -if "%ORPA_ARGV%"=="" goto :no_param -set ORPA_ARGV=%ORPA_ARGV% %1 -goto :loop1_next -:no_param -set ORPA_ARGV=%1 -:loop1_next -shift -goto loop1 -:after_loop -echo PYTHON-CONFIGURE: ОБНАРУЖЕНЫ ПАРАМЕТРЫ ИНИЦИАЛИЗАЦИИ ПРОГРАММЫ: %ORPA_ARGV% - -:echo_check -rem включить Echo, если он был принудительно выключен -if NOT [%TEMP_ECHO_NO%]==[] goto :echo_on -goto :eof -:echo_on -@echo on -:eof -if "%ORPA_ARGV%"=="" goto :eof2 -%ORPA_ARGV% -pause>nul +chcp 65001 +if [%1]==[echo_on] goto :program +:echo_no +set TEMP_ECHO_NO=TRUE +@echo off +:program +if NOT "%PYTHON_CONFIGURE%"=="" goto :echo_check +set PYTHON_CONFIGURE=%~f0 +set CD_PREV=%cd% +rem "%~dp0..\Resources" - УСТАНОВКА ПУТИ ОТ РАСПОЛОЖЕНИЯ ФАЙЛА, В КОТОРОМ НАПИСАН ЭТОТ ТЕКСТ. ВНИМАНИЕ! ПОСЛЕ %~dp0 СИМВОЛ \ СТАВИТЬ НЕ ТРЕБУЕТСЯ +rem "%cd%\..\Resources" - УСТАНОВКА ПУТИ ОТ РАБОЧЕЙ ДИРЕКТОРИИ, В КОТОРОЙ БЫЛ ВЫЗВАН ЭТОТ СКРИПТ. ВНИМАНИЕ! ПОСЛЕ %cd% СИМВОЛ \ СТАВИТЬ ТРЕБУЕТСЯ ОБЯЗАТЕЛЬНО +rem Пример использования python-win-configure.cmd python - выполнить команду python в настроенном окружении + +goto comment_set_path +rem ПРИМЕР КОНСТРУКЦИИ ДЛЯ ДОБАВЛЕНИЯ ДИРЕКТОРИИ В ПЕРЕМЕННУЮ ОКРУЖЕНИЯ PATH +set TEMP_LOCATION="%~dp0..\Resources\WPy64-3720\python-3.7.2.amd64" +cd /d %TEMP_LOCATION% +set PATH=%cd%;%PATH% +rem ВНИМАНИЕ! ЗНАК = ДОЛЖЕН БЫТЬ УСТАНОВЛЕН ВПРИТЫК С ПЕРЕМЕННОЙ ОКРУЖЕНИЯ И ЗНАЧЕНИЕМ - ИНАЧЕ УСТАНОВКА ЗНАЧЕНИЯ БУДЕТ ПРОИЗВЕДЕНА НЕКОРРЕКТНО +:comment_set_path + +goto comment_set_pythonpath +rem ПРИМЕР КОНСТРУКЦИИ ДЛЯ ДОБАВЛЕНИЯ ДИРЕКТОРИИ В ПЕРЕМЕННУЮ ОКРУЖЕНИЯ PYTHONPATH +set TEMP_LOCATION="%~dp0..\Sources" +cd /d %TEMP_LOCATION% +set PYTHONPATH=%cd%;%PYTHONPATH% +rem ВНИМАНИЕ! ЗНАК = ДОЛЖЕН БЫТЬ УСТАНОВЛЕН ВПРИТЫК С ПЕРЕМЕННОЙ ОКРУЖЕНИЯ И ЗНАЧЕНИЕМ - ИНАЧЕ УСТАНОВКА ЗНАЧЕНИЯ БУДЕТ ПРОИЗВЕДЕНА НЕКОРРЕКТНО +:comment_set_pythonpath + +rem ЗОНА УСТАНОВКИ ПЕРЕМЕННЫХ ОКРУЖЕНИЯ! +:configure +set TEMP_LOCATION="%~dp0..\Resources\WPy64-3720\python-3.7.2.amd64\Scripts" +cd /d %TEMP_LOCATION% +set PATH=%cd%;%PATH% + +set TEMP_LOCATION="%~dp0..\Resources\WPy64-3720\python-3.7.2.amd64" +cd /d %TEMP_LOCATION% +set PATH=%cd%;%PATH% + +set TEMP_LOCATION="%~dp0..\Sources" +cd /d %TEMP_LOCATION% +set PYTHONPATH=%cd%;%PYTHONPATH% + +rem восстановление каталога рабочей директории программы +cd /d %CD_PREV% + +rem выполнить вызов, если есть параметры, начиная с %2+ +if "%1"=="" goto :echo_check +set ORPA_ARGV= +rem один shift - все параметры, начиная с %2 (или с %1, если не echo_on) +if "%1"=="echo_on" shift +:loop1 +if "%1"=="" goto after_loop +if "%ORPA_ARGV%"=="" goto :no_param +set ORPA_ARGV=%ORPA_ARGV% %1 +goto :loop1_next +:no_param +set ORPA_ARGV=%1 +:loop1_next +shift +goto loop1 +:after_loop +echo PYTHON-CONFIGURE: ОБНАРУЖЕНЫ ПАРАМЕТРЫ ИНИЦИАЛИЗАЦИИ ПРОГРАММЫ: %ORPA_ARGV% + +:echo_check +rem включить Echo, если он был принудительно выключен +if NOT [%TEMP_ECHO_NO%]==[] goto :echo_on +goto :eof +:echo_on +@echo on +:eof +if "%ORPA_ARGV%"=="" goto :eof2 +%ORPA_ARGV% +pause>nul :eof2 \ No newline at end of file diff --git a/Scripts/PythonWinInit.cmd b/Scripts/PythonWinInit.cmd index 89840a9c..327184ac 100644 --- a/Scripts/PythonWinInit.cmd +++ b/Scripts/PythonWinInit.cmd @@ -1,24 +1,24 @@ -@echo off -chcp 65001 -echo Формат использования PythonWinInit.cmd [console,script] [имя запускаемого процесса.exe] [имя убиваемого процесса.exe] -echo Пример использования PythonWinInit.cmd script orpa-rbt.exe orpa-rbt.exe - -if [%2]==[] 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\%2" -if [%3]==[] goto :python-env -goto taskkill -:taskkill -taskkill /im "%3" /F /fi "username eq %username%" -goto :python-env -:python-env -call "%~dp0PythonWinConfigure.cmd" -echo Инициализация Python окружения прошла успешно! -if [%1]==[] goto :console -if [%1]==[console] goto :console -goto :eof -:console -cmd -:eof +@echo off +chcp 65001 +echo Формат использования PythonWinInit.cmd [console,script] [имя запускаемого процесса.exe] [имя убиваемого процесса.exe] +echo Пример использования PythonWinInit.cmd script orpa-rbt.exe orpa-rbt.exe + +if [%2]==[] 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\%2" +if [%3]==[] goto :python-env +goto taskkill +:taskkill +taskkill /im "%3" /F /fi "username eq %username%" +goto :python-env +:python-env +call "%~dp0PythonWinConfigure.cmd" +echo Инициализация Python окружения прошла успешно! +if [%1]==[] goto :console +if [%1]==[console] goto :console +goto :eof +:console +cmd +:eof @echo on \ No newline at end of file diff --git a/Scripts/RevisionLastUpdate.cmd b/Scripts/RevisionLastUpdate.cmd index 378c325e..26d7def1 100644 --- a/Scripts/RevisionLastUpdate.cmd +++ b/Scripts/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/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 From 04c56ffbf7ff9b1df6bb80243227d804f938b1f6 Mon Sep 17 00:00:00 2001 From: Ivan Maslov Date: Tue, 1 Nov 2022 10:59:35 +0300 Subject: [PATCH 2/3] fix unix lf in jupyter --- Tools/Jupyter-notebooks/init-nbextension.cmd | 14 +++--- Tools/Jupyter-notebooks/init-python-env.cmd | 46 ++++++++++---------- Tools/Jupyter-notebooks/start-python-env.cmd | 6 +-- Tools/Jupyter-notebooks/start.cmd | 4 +- 4 files changed, 35 insertions(+), 35 deletions(-) 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 From 28078f8b41d7bb7a18d16d4a3753506dad5602e1 Mon Sep 17 00:00:00 2001 From: Ivan Maslov Date: Tue, 1 Nov 2022 17:44:36 +0300 Subject: [PATCH 3/3] fix unix new line in win cmd files --- Agent/kill.cmd | 4 +- Agent/start-daemon.cmd | 10 ++--- Agent/start.cmd | 10 ++--- Git/Branch_devIvan_master.cmd | 16 +++---- Git/Clean.cmd | 4 +- Git/Pull.cmd | 2 +- Git/RevisionLastUpdate.cmd | 6 +-- Orchestrator/init-python-env.cmd | 46 ++++++++++---------- Orchestrator/start-python-env.cmd | 6 +-- Orchestrator/start.cmd | 8 ++-- Studio/start.cmd | 8 ++-- Tools/Jupyter-notebooks/init-nbextension.cmd | 14 +++--- Tools/Jupyter-notebooks/init-python-env.cmd | 46 ++++++++++---------- Tools/Jupyter-notebooks/start-python-env.cmd | 6 +-- Tools/Jupyter-notebooks/start.cmd | 4 +- 15 files changed, 95 insertions(+), 95 deletions(-) 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