Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
This commit is contained in:
Michael Bøcker-Larsen
commit
2120573783
@ -25,11 +25,15 @@ Oh My Zsh is installed by running one of the following commands in your terminal
|
|||||||
|
|
||||||
#### via curl
|
#### via curl
|
||||||
|
|
||||||
`sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"`
|
```shell
|
||||||
|
sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
|
||||||
|
```
|
||||||
|
|
||||||
#### via wget
|
#### via wget
|
||||||
|
|
||||||
`sh -c "$(wget https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)"`
|
```shell
|
||||||
|
sh -c "$(wget https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)"
|
||||||
|
```
|
||||||
|
|
||||||
## Using Oh My Zsh
|
## Using Oh My Zsh
|
||||||
|
|
||||||
@ -100,7 +104,7 @@ The default location is `~/.oh-my-zsh` (hidden in your home directory)
|
|||||||
If you'd like to change the install directory with the `ZSH` environment variable, either by running `export ZSH=/your/path` before installing, or by setting it before the end of the install pipeline like this:
|
If you'd like to change the install directory with the `ZSH` environment variable, either by running `export ZSH=/your/path` before installing, or by setting it before the end of the install pipeline like this:
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | ZSH=~/.dotfiles/zsh sh
|
export ZSH="~/.dotfiles/oh-my-zsh"; sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
|
||||||
```
|
```
|
||||||
|
|
||||||
#### Manual Installation
|
#### Manual Installation
|
||||||
|
|||||||
@ -10,7 +10,7 @@ cfc () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# compile from clipboard & print
|
# compile from clipboard & print
|
||||||
alias cfp='coffeeMe "$(clippaste)"'
|
alias cfp='cf "$(clippaste)"'
|
||||||
|
|
||||||
# compile from clipboard and copy to clipboard
|
# compile from clipboard and copy to clipboard
|
||||||
alias cfpc='cfp | clipcopy'
|
alias cfpc='cfp | clipcopy'
|
||||||
|
|||||||
@ -8,17 +8,7 @@ _rake_refresh () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
_rake_does_task_list_need_generating () {
|
_rake_does_task_list_need_generating () {
|
||||||
if [ ! -f .rake_tasks ]; then return 0;
|
[[ ! -f .rake_tasks ]] || [[ Rakefile -nt .rake_tasks ]]
|
||||||
else
|
|
||||||
if [[ "$OSTYPE" = darwin* ]]; then
|
|
||||||
accurate=$(stat -f%m .rake_tasks)
|
|
||||||
changed=$(stat -f%m Rakefile)
|
|
||||||
else
|
|
||||||
accurate=$(stat -c%Y .rake_tasks)
|
|
||||||
changed=$(stat -c%Y Rakefile)
|
|
||||||
fi
|
|
||||||
return $(expr $accurate '>=' $changed)
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
_rake_generate () {
|
_rake_generate () {
|
||||||
|
|||||||
232
tools/install.sh
232
tools/install.sh
@ -1,118 +1,122 @@
|
|||||||
# Use colors, but only if connected to a terminal, and that terminal
|
main() {
|
||||||
# supports them.
|
# Use colors, but only if connected to a terminal, and that terminal
|
||||||
if which tput >/dev/null 2>&1; then
|
# supports them.
|
||||||
ncolors=$(tput colors)
|
if which tput >/dev/null 2>&1; then
|
||||||
fi
|
ncolors=$(tput colors)
|
||||||
if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
|
|
||||||
RED="$(tput setaf 1)"
|
|
||||||
GREEN="$(tput setaf 2)"
|
|
||||||
YELLOW="$(tput setaf 3)"
|
|
||||||
BLUE="$(tput setaf 4)"
|
|
||||||
BOLD="$(tput bold)"
|
|
||||||
NORMAL="$(tput sgr0)"
|
|
||||||
else
|
|
||||||
RED=""
|
|
||||||
GREEN=""
|
|
||||||
YELLOW=""
|
|
||||||
BLUE=""
|
|
||||||
BOLD=""
|
|
||||||
NORMAL=""
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Only enable exit-on-error after the non-critical colorization stuff,
|
|
||||||
# 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
|
|
||||||
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
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -d "$ZSH" ]; then
|
|
||||||
printf "${YELLOW}You already have Oh My Zsh installed.${NORMAL}\n"
|
|
||||||
printf "You'll need to remove $ZSH if you want to re-install.\n"
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Prevent the cloned repository from having insecure permissions. Failing to do
|
|
||||||
# so causes compinit() calls to fail with "command not found: compdef" errors
|
|
||||||
# for users with insecure umasks (e.g., "002", allowing group writability). Note
|
|
||||||
# that this will be ignored under Cygwin by default, as Windows ACLs take
|
|
||||||
# precedence over umasks except for filesystems mounted with option "noacl".
|
|
||||||
umask g-w,o-w
|
|
||||||
|
|
||||||
printf "${BLUE}Cloning Oh My Zsh...${NORMAL}\n"
|
|
||||||
hash git >/dev/null 2>&1 || {
|
|
||||||
echo "Error: git is not installed"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
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
|
|
||||||
}
|
|
||||||
|
|
||||||
# The Windows (MSYS) Git is not compatible with normal use on cygwin
|
|
||||||
if [ "$OSTYPE" = cygwin ]; then
|
|
||||||
if git --version | grep msysgit > /dev/null; then
|
|
||||||
echo "Error: Windows/MSYS Git is not supported on Cygwin"
|
|
||||||
echo "Error: Make sure the Cygwin git package is installed and is first on the path"
|
|
||||||
exit 1
|
|
||||||
fi
|
fi
|
||||||
fi
|
if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
|
||||||
|
RED="$(tput setaf 1)"
|
||||||
printf "${BLUE}Looking for an existing zsh config...${NORMAL}\n"
|
GREEN="$(tput setaf 2)"
|
||||||
if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then
|
YELLOW="$(tput setaf 3)"
|
||||||
printf "${YELLOW}Found ~/.zshrc.${NORMAL} ${GREEN}Backing up to ~/.zshrc.pre-oh-my-zsh${NORMAL}\n";
|
BLUE="$(tput setaf 4)"
|
||||||
mv ~/.zshrc ~/.zshrc.pre-oh-my-zsh;
|
BOLD="$(tput bold)"
|
||||||
fi
|
NORMAL="$(tput sgr0)"
|
||||||
|
|
||||||
printf "${BLUE}Using the Oh My Zsh template file and adding it to ~/.zshrc${NORMAL}\n"
|
|
||||||
cp $ZSH/templates/zshrc.zsh-template ~/.zshrc
|
|
||||||
sed "/^export ZSH=/ c\\
|
|
||||||
export ZSH=$ZSH
|
|
||||||
" ~/.zshrc > ~/.zshrc-omztemp
|
|
||||||
mv -f ~/.zshrc-omztemp ~/.zshrc
|
|
||||||
|
|
||||||
printf "${BLUE}Copying your current PATH and adding it to the end of ~/.zshrc for you.${NORMAL}\n"
|
|
||||||
sed "/export PATH=/ c\\
|
|
||||||
export PATH=\"$PATH\"
|
|
||||||
" ~/.zshrc > ~/.zshrc-omztemp
|
|
||||||
mv -f ~/.zshrc-omztemp ~/.zshrc
|
|
||||||
|
|
||||||
# If this user's login shell is not already "zsh", attempt to switch.
|
|
||||||
TEST_CURRENT_SHELL=$(expr "$SHELL" : '.*/\(.*\)')
|
|
||||||
if [ "$TEST_CURRENT_SHELL" != "zsh" ]; then
|
|
||||||
# If this platform provides a "chsh" command (not Cygwin), do it, man!
|
|
||||||
if hash chsh >/dev/null 2>&1; then
|
|
||||||
printf "${BLUE}Time to change your default shell to zsh!${NORMAL}\n"
|
|
||||||
chsh -s $(grep /zsh$ /etc/shells | tail -1)
|
|
||||||
# Else, suggest the user do so manually.
|
|
||||||
else
|
else
|
||||||
printf "I can't change your shell automatically because this system does not have chsh.\n"
|
RED=""
|
||||||
printf "${BLUE}Please manually change your default shell to zsh!${NORMAL}\n"
|
GREEN=""
|
||||||
|
YELLOW=""
|
||||||
|
BLUE=""
|
||||||
|
BOLD=""
|
||||||
|
NORMAL=""
|
||||||
fi
|
fi
|
||||||
fi
|
|
||||||
|
|
||||||
printf "${GREEN}"
|
# Only enable exit-on-error after the non-critical colorization stuff,
|
||||||
echo ' __ __ '
|
# which may fail on systems lacking tput or terminfo
|
||||||
echo ' ____ / /_ ____ ___ __ __ ____ _____/ /_ '
|
set -e
|
||||||
echo ' / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ '
|
|
||||||
echo '/ /_/ / / / / / / / / / / /_/ / / /_(__ ) / / / '
|
CHECK_ZSH_INSTALLED=$(grep /zsh$ /etc/shells | wc -l)
|
||||||
echo '\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ '
|
if [ ! $CHECK_ZSH_INSTALLED -ge 1 ]; then
|
||||||
echo ' /____/ ....is now installed!'
|
printf "${YELLOW}Zsh is not installed!${NORMAL} Please install zsh first!\n"
|
||||||
echo ''
|
exit
|
||||||
echo ''
|
fi
|
||||||
echo 'Please look over the ~/.zshrc file to select plugins, themes, and options.'
|
unset CHECK_ZSH_INSTALLED
|
||||||
echo ''
|
|
||||||
echo 'p.s. Follow us at https://twitter.com/ohmyzsh.'
|
if [ ! -n "$ZSH" ]; then
|
||||||
echo ''
|
ZSH=~/.oh-my-zsh
|
||||||
echo 'p.p.s. Get stickers and t-shirts at http://shop.planetargon.com.'
|
fi
|
||||||
echo ''
|
|
||||||
printf "${NORMAL}"
|
if [ -d "$ZSH" ]; then
|
||||||
env zsh
|
printf "${YELLOW}You already have Oh My Zsh installed.${NORMAL}\n"
|
||||||
|
printf "You'll need to remove $ZSH if you want to re-install.\n"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Prevent the cloned repository from having insecure permissions. Failing to do
|
||||||
|
# so causes compinit() calls to fail with "command not found: compdef" errors
|
||||||
|
# for users with insecure umasks (e.g., "002", allowing group writability). Note
|
||||||
|
# that this will be ignored under Cygwin by default, as Windows ACLs take
|
||||||
|
# precedence over umasks except for filesystems mounted with option "noacl".
|
||||||
|
umask g-w,o-w
|
||||||
|
|
||||||
|
printf "${BLUE}Cloning Oh My Zsh...${NORMAL}\n"
|
||||||
|
hash git >/dev/null 2>&1 || {
|
||||||
|
echo "Error: git is not installed"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
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
|
||||||
|
}
|
||||||
|
|
||||||
|
# The Windows (MSYS) Git is not compatible with normal use on cygwin
|
||||||
|
if [ "$OSTYPE" = cygwin ]; then
|
||||||
|
if git --version | grep msysgit > /dev/null; then
|
||||||
|
echo "Error: Windows/MSYS Git is not supported on Cygwin"
|
||||||
|
echo "Error: Make sure the Cygwin git package is installed and is first on the path"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
printf "${BLUE}Looking for an existing zsh config...${NORMAL}\n"
|
||||||
|
if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then
|
||||||
|
printf "${YELLOW}Found ~/.zshrc.${NORMAL} ${GREEN}Backing up to ~/.zshrc.pre-oh-my-zsh${NORMAL}\n";
|
||||||
|
mv ~/.zshrc ~/.zshrc.pre-oh-my-zsh;
|
||||||
|
fi
|
||||||
|
|
||||||
|
printf "${BLUE}Using the Oh My Zsh template file and adding it to ~/.zshrc${NORMAL}\n"
|
||||||
|
cp $ZSH/templates/zshrc.zsh-template ~/.zshrc
|
||||||
|
sed "/^export ZSH=/ c\\
|
||||||
|
export ZSH=$ZSH
|
||||||
|
" ~/.zshrc > ~/.zshrc-omztemp
|
||||||
|
mv -f ~/.zshrc-omztemp ~/.zshrc
|
||||||
|
|
||||||
|
printf "${BLUE}Copying your current PATH and adding it to the end of ~/.zshrc for you.${NORMAL}\n"
|
||||||
|
sed "/export PATH=/ c\\
|
||||||
|
export PATH=\"$PATH\"
|
||||||
|
" ~/.zshrc > ~/.zshrc-omztemp
|
||||||
|
mv -f ~/.zshrc-omztemp ~/.zshrc
|
||||||
|
|
||||||
|
# If this user's login shell is not already "zsh", attempt to switch.
|
||||||
|
TEST_CURRENT_SHELL=$(expr "$SHELL" : '.*/\(.*\)')
|
||||||
|
if [ "$TEST_CURRENT_SHELL" != "zsh" ]; then
|
||||||
|
# If this platform provides a "chsh" command (not Cygwin), do it, man!
|
||||||
|
if hash chsh >/dev/null 2>&1; then
|
||||||
|
printf "${BLUE}Time to change your default shell to zsh!${NORMAL}\n"
|
||||||
|
chsh -s $(grep /zsh$ /etc/shells | tail -1)
|
||||||
|
# Else, suggest the user do so manually.
|
||||||
|
else
|
||||||
|
printf "I can't change your shell automatically because this system does not have chsh.\n"
|
||||||
|
printf "${BLUE}Please manually change your default shell to zsh!${NORMAL}\n"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
printf "${GREEN}"
|
||||||
|
echo ' __ __ '
|
||||||
|
echo ' ____ / /_ ____ ___ __ __ ____ _____/ /_ '
|
||||||
|
echo ' / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ '
|
||||||
|
echo '/ /_/ / / / / / / / / / / /_/ / / /_(__ ) / / / '
|
||||||
|
echo '\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ '
|
||||||
|
echo ' /____/ ....is now installed!'
|
||||||
|
echo ''
|
||||||
|
echo ''
|
||||||
|
echo 'Please look over the ~/.zshrc file to select plugins, themes, and options.'
|
||||||
|
echo ''
|
||||||
|
echo 'p.s. Follow us at https://twitter.com/ohmyzsh.'
|
||||||
|
echo ''
|
||||||
|
echo 'p.p.s. Get stickers and t-shirts at http://shop.planetargon.com.'
|
||||||
|
echo ''
|
||||||
|
printf "${NORMAL}"
|
||||||
|
env zsh
|
||||||
|
}
|
||||||
|
|
||||||
|
main
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
read -r -p "Are you sure you want to remove Oh My Zsh? [y/N] " confirmation
|
read -r -p "Are you sure you want to remove Oh My Zsh? [y/N] " confirmation
|
||||||
if ! [[ $confirmation =~ ^[yY]$ ]]
|
if [ "$confirmation" != y ] && [ "$confirmation" != Y ]
|
||||||
then
|
then
|
||||||
echo "Uninstall cancelled"
|
echo "Uninstall cancelled"
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Removing ~/.oh-my-zsh"
|
echo "Removing ~/.oh-my-zsh"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user