Mettre à jour 'tools/install.sh'

This commit is contained in:
Adphi 2018-07-15 09:24:47 +02:00
parent bd01d79bf0
commit 0623a42f0e

View File

@ -20,14 +20,12 @@ main() {
NORMAL="" NORMAL=""
fi fi
# Only enable exit-on-error after the non-critical colorization # Only enable exit-on-error after the non-critical colorization stuff,
stuff,
# which may fail on systems lacking tput or terminfo # which may fail on systems lacking tput or terminfo
set -e set -e
if ! command -v zsh >/dev/null 2>&1; then if ! command -v zsh >/dev/null 2>&1; then
printf "${YELLOW}Zsh is not installed!${NORMAL} Please install zsh printf "${YELLOW}Zsh is not installed!${NORMAL} Please install zsh first!\n"
first!\n"
exit exit
fi fi
@ -41,16 +39,11 @@ first!\n"
exit exit
fi fi
# Prevent the cloned repository from having insecure permissions. # Prevent the cloned repository from having insecure permissions. Failing to do
Failing to do # so causes compinit() calls to fail with "command not found: compdef" errors
# so causes compinit() calls to fail with "command not found: # for users with insecure umasks (e.g., "002", allowing group writability). Note
compdef" errors # that this will be ignored under Cygwin by default, as Windows ACLs take
# for users with insecure umasks (e.g., "002", allowing group # precedence over umasks except for filesystems mounted with option "noacl".
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 umask g-w,o-w
printf "${BLUE}Cloning Oh My Zsh...${NORMAL}\n" printf "${BLUE}Cloning Oh My Zsh...${NORMAL}\n"
@ -62,13 +55,11 @@ take
if [ "$OSTYPE" = cygwin ]; then if [ "$OSTYPE" = cygwin ]; then
if git --version | grep msysgit > /dev/null; then if git --version | grep msysgit > /dev/null; then
echo "Error: Windows/MSYS Git is not supported on Cygwin" echo "Error: Windows/MSYS Git is not supported on Cygwin"
echo "Error: Make sure the Cygwin git package is installed and echo "Error: Make sure the Cygwin git package is installed and is first on the path"
is first on the path"
exit 1 exit 1
fi fi
fi fi
env git clone --depth=1 env git clone --depth=1 http://git.adphi.net/Adphi/oh-my-zsh.git "$ZSH" || {
http://git.adphi.net/Adphi/oh-my-zsh.git "$ZSH" || {
printf "Error: git clone of oh-my-zsh repo failed\n" printf "Error: git clone of oh-my-zsh repo failed\n"
exit 1 exit 1
} }
@ -76,35 +67,28 @@ http://git.adphi.net/Adphi/oh-my-zsh.git "$ZSH" || {
printf "${BLUE}Looking for an existing zsh config...${NORMAL}\n" printf "${BLUE}Looking for an existing zsh config...${NORMAL}\n"
if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then
printf "${YELLOW}Found ~/.zshrc.${NORMAL} ${GREEN}Backing up to printf "${YELLOW}Found ~/.zshrc.${NORMAL} ${GREEN}Backing up to ~/.zshrc.pre-oh-my-zsh${NORMAL}\n";
~/.zshrc.pre-oh-my-zsh${NORMAL}\n";
mv ~/.zshrc ~/.zshrc.pre-oh-my-zsh; mv ~/.zshrc ~/.zshrc.pre-oh-my-zsh;
fi fi
printf "${BLUE}Using the Oh My Zsh template file and adding it to printf "${BLUE}Using the Oh My Zsh template file and adding it to ~/.zshrc${NORMAL}\n"
~/.zshrc${NORMAL}\n"
cp "$ZSH"/templates/zshrc.zsh-template ~/.zshrc cp "$ZSH"/templates/zshrc.zsh-template ~/.zshrc
sed "/^export ZSH=/ c\\ sed "/^export ZSH=/ c\\
export ZSH=\"$ZSH\" export ZSH=\"$ZSH\"
" ~/.zshrc > ~/.zshrc-omztemp " ~/.zshrc > ~/.zshrc-omztemp
mv -f ~/.zshrc-omztemp ~/.zshrc mv -f ~/.zshrc-omztemp ~/.zshrc
# If this user's login shell is not already "zsh", attempt to # If this user's login shell is not already "zsh", attempt to switch.
switch.
TEST_CURRENT_SHELL=$(expr "$SHELL" : '.*/\(.*\)') TEST_CURRENT_SHELL=$(expr "$SHELL" : '.*/\(.*\)')
if [ "$TEST_CURRENT_SHELL" != "zsh" ]; then if [ "$TEST_CURRENT_SHELL" != "zsh" ]; then
# If this platform provides a "chsh" command (not Cygwin), do it, # If this platform provides a "chsh" command (not Cygwin), do it, man!
man!
if hash chsh >/dev/null 2>&1; then if hash chsh >/dev/null 2>&1; then
printf "${BLUE}Time to change your default shell to printf "${BLUE}Time to change your default shell to zsh!${NORMAL}\n"
zsh!${NORMAL}\n"
chsh -s $(grep /zsh$ /etc/shells | tail -1) chsh -s $(grep /zsh$ /etc/shells | tail -1)
# Else, suggest the user do so manually. # Else, suggest the user do so manually.
else else
printf "I can't change your shell automatically because this printf "I can't change your shell automatically because this system does not have chsh.\n"
system does not have chsh.\n" printf "${BLUE}Please manually change your default shell to zsh!${NORMAL}\n"
printf "${BLUE}Please manually change your default shell to
zsh!${NORMAL}\n"
fi fi
fi fi
@ -114,17 +98,14 @@ zsh!${NORMAL}\n"
echo ' / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ ' echo ' / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ '
echo '/ /_/ / / / / / / / / / / /_/ / / /_(__ ) / / / ' echo '/ /_/ / / / / / / / / / / /_/ / / /_(__ ) / / / '
echo '\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ ' echo '\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ '
echo ' /____/ ....is echo ' /____/ ....is now installed!'
now installed!'
echo '' echo ''
echo '' echo ''
echo 'Please look over the ~/.zshrc file to select plugins, themes, echo 'Please look over the ~/.zshrc file to select plugins, themes, and options.'
and options.'
echo '' echo ''
echo 'p.s. Follow us at https://twitter.com/ohmyzsh.' echo 'p.s. Follow us at https://twitter.com/ohmyzsh.'
echo '' echo ''
echo 'p.p.s. Get stickers and t-shirts at echo 'p.p.s. Get stickers and t-shirts at https://shop.planetargon.com.'
https://shop.planetargon.com.'
echo '' echo ''
printf "${NORMAL}" printf "${NORMAL}"
env zsh -l env zsh -l