Commit 583d10f4da0d8445d32cf5f452b29c49f77c1af5
Exists in
master
and in
2 other branches
Merge branch 'master' of git.str8.biz:mj/zsh-config
Showing 2 changed files Side-by-side Diff
templates/zshrc.sh
1 | 1 | #@IgnoreInspection AddShebang |
2 | 2 | |
3 | 3 | export ZCFG=$HOME/.config/zsh-config |
4 | +export ZCFG_SPLIT=1 | |
4 | 5 | |
5 | -# ENVIRONMENT: | |
6 | +# Environment | |
6 | 7 | export GJ_ENV=local_aptproxy |
7 | - | |
8 | 8 | export LANG=en_US.UTF-8 |
9 | - | |
10 | -# Compilation flags | |
11 | 9 | export ARCHFLAGS="-arch x86_64" |
12 | 10 | |
13 | 11 | # User configuration |
... | ... | @@ -15,10 +13,11 @@ export PATH=$HOME/bin:/usr/local/bin:$PATH |
15 | 13 | # export MANPATH="/usr/local/man:$MANPATH" |
16 | 14 | |
17 | 15 | plugins=( |
18 | - #meteor node npm | |
16 | + # meteor | |
17 | + # node npm | |
19 | 18 | ) |
20 | 19 | |
21 | -# Aliases | |
20 | +# Main .zshrc | |
22 | 21 | if [ -f $ZCFG/dotfiles/zshrc.sh ]; then |
23 | 22 | . $ZCFG/dotfiles/zshrc.sh |
24 | 23 | fi |
25 | 24 | \ No newline at end of file |
tools/install.sh
... | ... | @@ -12,28 +12,19 @@ |
12 | 12 | |
13 | 13 | set -e |
14 | 14 | |
15 | -if [ "$UID" != "0" ]; then CMD_PREFIX="sudo"; else CMD_PREFIX=""; fi | |
15 | +if [ -d /proc/vz ] && [ ! -d /proc/vz/beancounter ]; then | |
16 | + apt-get -yq install curl dialog git nano zsh | |
17 | +else | |
18 | + if [ "$UID" != "0" ]; then CMD_PREFIX="sudo"; else CMD_PREFIX=""; fi | |
16 | 19 | |
17 | -if [ "$SHELL" != "$(which zsh)" ]; then | |
18 | - echo "$(which zsh)" | |
19 | - $CMD_PREFIX echo "enter pass...." | |
20 | - | |
21 | - echo "ok" | |
22 | - | |
23 | - $CMD_PREFIX apt-get -yq install curl dialog git nano zsh | |
24 | -fi | |
25 | - | |
26 | -if [ 1 == 2 ]; then | |
27 | - #sudo apt-get -yq python-setuptools | |
28 | - | |
29 | - #sudo easy_install pip | |
30 | - #sudo pip install virtualenvwrapper | |
20 | + if [ "$SHELL" != "$(which zsh)" ]; then | |
21 | + echo "$(which zsh)" | |
22 | + $CMD_PREFIX echo "enter pass...." | |
31 | 23 | |
32 | - mkvirtualenv cb-meteor | |
33 | - pip install nodeenv | |
34 | - nodeenv -p | |
24 | + echo "ok" | |
35 | 25 | |
36 | - # curl https://install.meteor.com/ | sh | |
26 | + $CMD_PREFIX apt-get -yq install curl dialog git nano zsh | |
27 | + fi | |
37 | 28 | fi |
38 | 29 | |
39 | 30 | if [ ! -n "$HOME" ]; then |