From a6861f0140d654f76f7847d87bf3f46207c775d5 Mon Sep 17 00:00:00 2001 From: Nikolas Weger Date: Sat, 27 Jan 2018 18:01:04 +0100 Subject: [PATCH] updated stuff --- cfg/zsh/cfg.d/export.zsh | 7 +++++-- lib/basher | 2 +- lib/completions | 2 +- lib/gitignore | 2 +- lib/has | 2 +- lib/ohmyzsh | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/cfg/zsh/cfg.d/export.zsh b/cfg/zsh/cfg.d/export.zsh index 597be1b..c51bc05 100644 --- a/cfg/zsh/cfg.d/export.zsh +++ b/cfg/zsh/cfg.d/export.zsh @@ -3,7 +3,7 @@ dotfls="${HOME}/dotfiles" dotlib="${dotfls}/lib" dotcfg="${dotfls}/cfg" brewpr="$(/home/linuxbrew/.linuxbrew/bin/brew --prefix)" -gembin="$(ruby -rubygems -e "puts Gem.user_dir")/bin" +gembin="$(ruby -e "puts Gem.user_dir")/bin" BASHER_SHELL=zsh BASHER_ROOT=/home/eeleater/.basher @@ -16,7 +16,10 @@ path+=(${dotfls}/bin) # Bin in Dotfiles path+=(${dotlib}/basher/bin ${BASHER_ROOT}/cellar/bin) # Basher path+=(${gembin}) # Ruby Gems path+=(/usr/lib/jvm/default/bin) # Java -if type pacman &>/dev/null; then path+=(/opt/android-sdk/build-tools/27.0.1); fi # Android SDK +if type pacman &>/dev/null; then + asdkver="$(pacman -Qm android-sdk-build-tools | awk '{print $2}' | cut -d'-' -f1 | cut -d'r' -f2)" + path+=(/opt/android-sdk/build-tools/${asdkver}); # Android SDK +fi # Manpath manpath+=(${brewpr}/share/man) diff --git a/lib/basher b/lib/basher index a67897b..2da0b00 160000 --- a/lib/basher +++ b/lib/basher @@ -1 +1 @@ -Subproject commit a67897bd08833af5dfbdff7084645fd09641d4b0 +Subproject commit 2da0b000521eb8db37dc82d2932e04821152d0f4 diff --git a/lib/completions b/lib/completions index 372f9b4..70a7a5c 160000 --- a/lib/completions +++ b/lib/completions @@ -1 +1 @@ -Subproject commit 372f9b47e9c528e0516652155308d239abc5b727 +Subproject commit 70a7a5cdee168b6cb9400cccbe48427906b6ca28 diff --git a/lib/gitignore b/lib/gitignore index b3ae381..22a5eb3 160000 --- a/lib/gitignore +++ b/lib/gitignore @@ -1 +1 @@ -Subproject commit b3ae3810f8b0f97f24cd61c2d3dd1b5089b91801 +Subproject commit 22a5eb3da72c0a224a179033e92722bdbf5a05ad diff --git a/lib/has b/lib/has index f6fe16c..3136085 160000 --- a/lib/has +++ b/lib/has @@ -1 +1 @@ -Subproject commit f6fe16c65949c96761048d9827426c3d61393f54 +Subproject commit 3136085c75efe0ff7023dd03603b28d16d084d83 diff --git a/lib/ohmyzsh b/lib/ohmyzsh index e273cf0..37c2d0d 160000 --- a/lib/ohmyzsh +++ b/lib/ohmyzsh @@ -1 +1 @@ -Subproject commit e273cf004e1ff0510aee61416885f3003bcd15d9 +Subproject commit 37c2d0ddd751e15d0c87a51e2d9f9849093571dc