From 5432334da62521252c12514bce7b850f18b73de3 Mon Sep 17 00:00:00 2001
From: ItsDrike <itsdrike@protonmail.com>
Date: Sat, 18 Dec 2021 05:48:36 +0100
Subject: [PATCH] Simplify python alias creation

---
 home/.config/shell/aliases | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/home/.config/shell/aliases b/home/.config/shell/aliases
index cc14cbd..b7433d2 100755
--- a/home/.config/shell/aliases
+++ b/home/.config/shell/aliases
@@ -79,23 +79,19 @@ alias zb='z -b'         # restrict matches to parent directories
 alias zi='z -I'         # cd with interactive fzf selection
 alias zbi='z -b -I'     # pick parent directory to cd into with fzf
 
-# Python
-alias ppy='python'
-alias ipy='ipython'
-alias bpy='bpython'
-command -v ipython > /dev/null && alias py='ipython' || alias py='python'
-for version in 2 3 3.6 3.7 3.8 3.9 3.10; do  # Make aliases for py3.6,py3.7,...
-    if ! command -v "python$version" > /dev/null; then
-        continue
-    fi
-    if command -v "ipython$version" > /dev/null; then
-        alias "py$version"="ipython$version"
-        alias "ipy$version"="ipython$version"
-        alias "ppy$version"="python$version"
-    else
-        alias "py$version"="python$version"
-        alias "ppy$version"="python$version"
-    fi
+## Make aliases for individual cpython/pypy versions
+py_versions="\n2\n3\n3.6\n3.7\n3.8\n3.9\n3.10"
+echo "$py_versions" | while read version; do
+    for python in python pypy; do
+        [ "$python" = "python" ] && prefix="py" || prefix="pypy"
+
+        if command -v "$python$version" >/dev/null; then
+            alias "pip$version=$python$version -m pip"
+            alias "$prefix$version=$python$version"
+            alias "i$prefix$version=$python$version -c 'import IPython;IPython.start_ipython()'"
+            alias "b$prefix$version=$python$version -c 'from bpython.curtsies import main;import sys;sys.exit(main())'"
+        fi
+    done
 done
 
 # Fallbacks