Skip to content

Commit add8783

Browse files
committed
Release 1.9.0
1 parent 5fa0336 commit add8783

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

src/vim/install.sh.acr

+10-13
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,27 @@ if [ $? = 1 ]; then
1212
echo "Cannot create vim directoryes at \$HOME"
1313
exit 1
1414
fi
15-
cp ${DATADIR}/acr/vim/ftplugin/acr.vim ~/.vim/ftplugin/acr.vim
16-
cp ${DATADIR}/acr/vim/syntax/acr.vim ~/.vim/syntax/acr.vim
15+
cp -f ${DATADIR}/acr/vim/ftplugin/acr.vim ~/.vim/ftplugin/acr.vim
16+
cp -f ${DATADIR}/acr/vim/syntax/acr.vim ~/.vim/syntax/acr.vim
1717

1818
if [ "$1" = "-f" ]; then
1919
if [ -e ~/.vimrc ]; then
2020
mv ~/.vimrc ~/.vimrc.orig
2121
cat ~/.vimrc.orig | grep -v "source ~/.vim/acr" > ~/.vimrc
2222
echo "Original .vimrc stored in ~/.vimrc.orig"
2323
fi
24-
else
25-
if [ -e ~/.vimrc ]; then
26-
if [ -n "`cat ~/.vimrc | grep acr | grep source`" ]; then
27-
echo "Failed: It looks that your have already acr syntax highlighting."
28-
echo "If you want to force installation remove the acr related line in ~/.vimrc"
29-
echo "This operation can be forced (-f), but may modify your ~/.vimrc (DANGEROUS)"
30-
exit 1
31-
fi
32-
fi
33-
fi
24+
else if [ -e ~/.vimrc ]; then
25+
if [ -n "`cat ~/.vimrc | grep acr | grep source`" ]; then
26+
echo "Failed: It looks that your have already acr syntax highlighting."
27+
echo "If you want to force installation remove the acr related line in ~/.vimrc"
28+
echo "This operation can be forced (-f), but may modify your ~/.vimrc (DANGEROUS)"
29+
exit 1
30+
fi
31+
fi ; fi
3432

3533
mkdir -p ~/.vim/
3634
cp -f ${DATADIR}/acr/vim/vimrc ~/.vim/acr
3735
echo "source ~/.vim/acr" >> ~/.vimrc
38-
3936
echo "Success: acr syntax highlighting for vim installed at \${HOME}."
4037

4138
exit 0

0 commit comments

Comments
 (0)