visualpython#37 - visualpy batch & shell add checking pip and pip3

minjk-bl · minjk-bl · commit 989180c28990 · 2021-06-13T17:51:23.000+09:00
diff --git a/bin/visualpy b/bin/visualpy
@@ -4,21 +4,24 @@
 # Filename : visualpy
 # function : control visualpython for Mac/Linux
 # Creator  : BlackLogic  - LJ
-# version  : 2.1
+# version  : 2.2
 # License  :
 # Date     : 2020 07.27
-# Mdate    : 2020 12.29
+# Mdate    : 2021 06.04
 #============================================================================
 
-v_path1=`pip show visualpython | grep Location | awk -F': ' '{print $2}'`
+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_prod='visualpython'
 v_str1='jupyter nbextension'
 v_str2='visualpython/src/main'
-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_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_list=`${v_str3} | grep -i ${v_prod}`
 v_curt=`${v_str4} | grep 'Version' | cut -d ' ' -f 2`
 v_option=$1
@@ -294,7 +297,7 @@ f_prt_extensiondir() {
     echo "jupyter contrib nbextension install --user"
     f_prt_line2
     echo "for pip"
-    echo "pip install -e jupyter_contrib_nbextensions"
+    echo "${v_pip} install -e jupyter_contrib_nbextensions"
     echo "jupyter contrib nbextension install --user"
     f_prt_line1
 }
diff --git a/bin/visualpy.bat b/bin/visualpy.bat
@@ -4,28 +4,31 @@ rem #==========================================================================
 rem # Filename : visualpy.bat
 rem # function : control Visual Python for windows
 rem # Creator  : BlackLogic - LJ
-rem # version  : 2.1
+rem # version  : 2.2
 rem # License  : GPLv3
 rem # Date     : 2020 07.30
-rem # MDate    : 2020 12.29
+rem # MDate    : 2021 06.04
 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 ('pip show %v_prod% 2^>^&1 ^| find "Location"') do (
+for /f "delims=, tokens=1*" %%i in ('%v_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=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%
+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%
 
 rem check env & setting path2
 where /q conda-env
