diff options
| -rwxr-xr-x | install.sh | 2 | ||||
| -rwxr-xr-x | python/install.sh | 28 | ||||
| -rw-r--r-- | python/requirements.pip38.txt | 1 | ||||
| -rw-r--r-- | python/requirements.pip39.txt | 3 | ||||
| -rw-r--r-- | subl3/Package Control.sublime-settings | 1 | ||||
| -rw-r--r-- | subl3/Preferences.sublime-settings | 3 |
6 files changed, 32 insertions, 6 deletions
@@ -3,7 +3,7 @@ set -e symlink () { - ln -sfT "$1" "$2" + ln -sfT "$@" } mkdir -p ~/bin diff --git a/python/install.sh b/python/install.sh index 3090eff..fe083b8 100755 --- a/python/install.sh +++ b/python/install.sh @@ -2,14 +2,38 @@ set -e +symlink () { + ln -sfT "$@" +} + PYTHON38=$(which python3.8) PYTHON39=$(which python3.9) PYTHON38_DIR=~/python38 PYTHON39_DIR=~/python39 +PIP38=$PYTHON38_DIR/bin/pip3.8 +PIP39=$PYTHON39_DIR/bin/pip3.9 + [ ! -d $PYTHON38_DIR ] && $PYTHON38 -m venv --system-site-packages $PYTHON38_DIR [ ! -d $PYTHON39_DIR ] && $PYTHON39 -m venv --system-site-packages $PYTHON39_DIR -$PYTHON38_DIR/bin/pip -q install -U -r ~/.dotfiles/python/requirements.pip38.txt -$PYTHON39_DIR/bin/pip -q install -U -r ~/.dotfiles/python/requirements.pip39.txt +$PIP38 -q install -U -r ~/.dotfiles/python/requirements.pip38.txt +$PIP39 -q install -U -r ~/.dotfiles/python/requirements.pip39.txt + +cat > ~/bin/python3.8 << EOF +#!/bin/sh +exec $(cd $PYTHON38_DIR; pwd)/bin/python3.8 "\$@" +EOF +cat > ~/bin/python3.9 << EOF +#!/bin/sh +exec $(cd $PYTHON39_DIR; pwd)/bin/python3.9 "\$@" +EOF +chmod +x ~/bin/python3.8 +chmod +x ~/bin/python3.9 + +symlink $PIP38 ~/bin/pip3.8 +symlink $PIP39 ~/bin/pip3.9 + +symlink $PYTHON38_DIR/bin/doit ~/bin/doit3.8 +symlink $PYTHON39_DIR/bin/doit ~/bin/doit3.9 diff --git a/python/requirements.pip38.txt b/python/requirements.pip38.txt index a1b589e..eb2c599 100644 --- a/python/requirements.pip38.txt +++ b/python/requirements.pip38.txt @@ -1 +1,2 @@ +doit pip diff --git a/python/requirements.pip39.txt b/python/requirements.pip39.txt index d790e53..8363634 100644 --- a/python/requirements.pip39.txt +++ b/python/requirements.pip39.txt @@ -1,2 +1,3 @@ -sublime-music +doit pip +sublime-music diff --git a/subl3/Package Control.sublime-settings b/subl3/Package Control.sublime-settings index 3854da2..012c376 100644 --- a/subl3/Package Control.sublime-settings +++ b/subl3/Package Control.sublime-settings @@ -19,6 +19,7 @@ "SublimeLinter-contrib-sass-lint", "SublimeLinter-eslint", "SublimeLinter-flake8", + "Zeal", "Zig Language" ] } diff --git a/subl3/Preferences.sublime-settings b/subl3/Preferences.sublime-settings index d3d644d..9dc87ca 100644 --- a/subl3/Preferences.sublime-settings +++ b/subl3/Preferences.sublime-settings @@ -55,8 +55,7 @@ "Python", "SublimeLinter-eslint", "Vintage", - "Zig Language", - "zzz A File Icon zzz" + "Zig Language" ], "line_padding_bottom": 1, "line_padding_top": 1, |