From f587a3b6857844c96367055562d7696a4f563a55 Mon Sep 17 00:00:00 2001 From: minjk-bl Date: Mon, 14 Jun 2021 01:10:53 +0900 Subject: [PATCH] revert batch & shell --- bin/visualpy | 23 ++++++++++------------- bin/visualpy.bat | 19 ++++++++----------- 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/bin/visualpy b/bin/visualpy index 07390592..3d51b6b2 100644 --- a/bin/visualpy +++ b/bin/visualpy @@ -4,24 +4,21 @@ # Filename : visualpy # function : control visualpython for Mac/Linux # Creator : BlackLogic - LJ -# version : 2.2 +# version : 2.1 # License : # Date : 2020 07.27 -# Mdate : 2021 06.04 +# Mdate : 2020 12.29 #============================================================================ -v_pip=pip -which pip3 > /dev/null 2>&1 && v_pip=pip3 - -v_path1=`${v_pip} show visualpython | grep Location | awk -F': ' '{print $2}'` +v_path1=`pip show visualpython | grep Location | awk -F': ' '{print $2}'` v_prod='visualpython' v_str1='jupyter nbextension' v_str2='visualpython/src/main' -v_unst='${v_pip} uninstall '${v_prod} -v_upgr='${v_pip} install '${v_prod}' --upgrade' -#v_srch='${v_pip} search '${v_prod} -v_str3='${v_pip} list -o ' -v_str4='${v_pip} show '${v_prod} +v_unst='pip uninstall '${v_prod} +v_upgr='pip install '${v_prod}' --upgrade' +#v_srch='pip search '${v_prod} +v_str3='pip list -o ' +v_str4='pip show '${v_prod} #v_list=`${v_str3} | grep -i ${v_prod}` v_curt=`${v_str4} | grep 'Version' | cut -d ' ' -f 2` v_option=$1 @@ -297,7 +294,7 @@ f_prt_extensiondir() { echo "jupyter contrib nbextension install --user" f_prt_line2 echo "for pip" - echo "${v_pip} install -e jupyter_contrib_nbextensions" + echo "pip install -e jupyter_contrib_nbextensions" echo "jupyter contrib nbextension install --user" f_prt_line1 } @@ -325,4 +322,4 @@ exit #============================================================================ #End of File -#============================================================================ +#============================================================================ \ No newline at end of file diff --git a/bin/visualpy.bat b/bin/visualpy.bat index 51235ca4..79bfa0d8 100644 --- a/bin/visualpy.bat +++ b/bin/visualpy.bat @@ -4,31 +4,28 @@ rem #========================================================================== rem # Filename : visualpy.bat rem # function : control Visual Python for windows rem # Creator : BlackLogic - LJ -rem # version : 2.2 +rem # version : 2.1 rem # License : GPLv3 rem # Date : 2020 07.30 -rem # MDate : 2021 06.04 +rem # MDate : 2020 12.29 rem #========================================================================== rem ## setting variables -set v_pip=pip -where pip3 > /dev/null 2>&1 && set v_pip=pip3 - set v_prod=visualpython (echo "%v_prod%" & echo.) | findstr /O . | more +1 | (set /P RESULT= & call exit /B %%RESULT%%) set /A v_prd_length=%ERRORLEVEL%-5 set v_option=%1 -for /f "delims=, tokens=1*" %%i in ('%v_pip% show %v_prod% 2^>^&1 ^| find "Location"') do ( +for /f "delims=, tokens=1*" %%i in ('pip show %v_prod% 2^>^&1 ^| find "Location"') do ( set v_1=%%i) set v_path1=%v_1:~10% set v_str1=jupyter nbextension set v_str2=%v_prod%/src/main -set v_srch=%v_pip% search %v_prod% -set v_upgr=%v_pip% install %v_prod% --upgrade -set v_unst=%v_pip% uninstall %v_prod% -set v_ckup=%v_pip% list -o -set v_show=%v_pip% show %v_prod% +set v_srch=pip search %v_prod% +set v_upgr=pip install %v_prod% --upgrade +set v_unst=pip uninstall %v_prod% +set v_ckup=pip list -o +set v_show=pip show %v_prod% rem check env & setting path2 where /q conda-env