adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add IBM i support

Browse Source
This commit is contained in:
Pierrick Rouxel 2016-06-30 11:08:05 +02:00
parent 7fabc8bca4
commit da6775db79
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/theme-and-appearance.zsh
View File

@ -5,7 +5,7 @@ export LSCOLORS="Gxfxcxdxbxegedabagacad"
# Enable ls colors
if [ "$DISABLE_LS_COLORS" != "true" ]
then
# Find the option for using colors in ls, depending on the version: Linux or BSD
# Find the option for using colors in ls, depending on the version: Linux, BSD or IBM i
if [[ "$(uname -s)" == "NetBSD" ]]; then
# On NetBSD, test if "gls" (GNU ls) is installed (this one supports colors);
# otherwise, leave ls as is, because NetBSD's ls doesn't support -G
@ -17,6 +17,8 @@ then
# coreutils, so prefer it to "gls".
gls --color -d . &>/dev/null 2>&1 && alias ls='gls --color=tty'
colorls -G -d . &>/dev/null 2>&1 && alias ls='colorls -G'
elif [[ "$(uname -s)" == "OS400" ]]; then
# On IBM i ls doesn't support colors
else
ls --color -d . &>/dev/null 2>&1 && alias ls='ls --color=tty' || alias ls='ls -G'
fi

18
tools/install.sh
View File

@ -24,12 +24,10 @@ main() {
# which may fail on systems lacking tput or terminfo
set -e
CHECK_ZSH_INSTALLED=$(grep /zsh$ /etc/shells | wc -l)
if [ ! $CHECK_ZSH_INSTALLED -ge 1 ]; then
if ! type zsh >/dev/null 2>&1; then
printf "${YELLOW}Zsh is not installed!${NORMAL} Please install zsh first!\n"
exit
fi
unset CHECK_ZSH_INSTALLED
if [ ! -n "$ZSH" ]; then
ZSH=~/.oh-my-zsh
@ -62,10 +60,18 @@ main() {
fi
fi
env git clone --depth=1 https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
printf "Error: git clone of oh-my-zsh repo failed\n"
exit 1
printf "Error: git clone of oh-my-zsh repo failed (https)\n"
GIT_CLONE_ERROR=1
}
# Support for git compiled without SSL
if [ $GIT_CLONE_ERROR -ge 1 ]; then
printf "Retry with ssh\n"
env git clone --depth=1 git@github.com:robbyrussell/oh-my-zsh.git $ZSH || {
printf "Error: git clone of oh-my-zsh repo failed (ssh)\n"
exit 1
}
fi
unset GIT_CLONE_ERROR
printf "${BLUE}Looking for an existing zsh config...${NORMAL}\n"
if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then