Compare commits
No commits in common. "26a3e5bc04a2e65ddb78537fdbae8886dad291f3" and "7f7b011d4a3bc2c1c183881e6fbe7d19c54d1235" have entirely different histories.
26a3e5bc04
...
7f7b011d4a
|
@ -194,14 +194,14 @@ function install-preferences {
|
|||
else
|
||||
inst make
|
||||
fi
|
||||
inst git
|
||||
inst git cmake clang llvm
|
||||
|
||||
|
||||
# Text editor
|
||||
if [ $TERMUX == 1 ]; then
|
||||
inst vim-python
|
||||
elif [ $DEBIAN == 1 ]; then
|
||||
inst vim-nox
|
||||
inst vim-youcompleteme
|
||||
ln -s $DEBLOC_ROOT/usr/bin/vim{.nox,}
|
||||
else
|
||||
inst vim
|
||||
|
@ -215,17 +215,16 @@ function install-preferences {
|
|||
vim +PluginInstall +qall
|
||||
|
||||
# YouCompleteMe (vim plugin)
|
||||
if [[ $DEBIAN == 1 || $TERMUX == 1 ]]; then
|
||||
inst python-dev python3-dev libxml2-dev libxslt-dev
|
||||
if [ $DEBIAN != 1 ]; then
|
||||
if [ $DEBIAN == 1 || $TERMUX == 1 ]; then
|
||||
inst python-dev python3-dev
|
||||
fi
|
||||
local YCM_ARGS=""
|
||||
if [ $TERMUX == 0 ]; then
|
||||
YCM_ARGS="$YCM_ARGS --clang-completer --tern-completer"
|
||||
fi
|
||||
python $HOME/.vim/bundle/YouCompleteMe/install.py $YCM_ARGS
|
||||
fi
|
||||
local YCM_ARGS=""
|
||||
if [ $TERMUX != 1 ]; then
|
||||
YCM_ARGS="$YCM_ARGS --clang-completer --tern-completer"
|
||||
fi
|
||||
if [[ $DEBIAN == 1 && $ADMIN == 0 ]]; then
|
||||
export CPLUS_INCLUDE_PATH="$DEBLOC_ROOT/usr/include/python2.7/:$DEBLOC_ROOT/usr/include/x86_64-linux-gnu/python2.7/:$CPLUS_INCLUDE_PATH"
|
||||
fi
|
||||
python $HOME/.vim/bundle/YouCompleteMe/install.py $YCM_ARGS
|
||||
|
||||
# Common GUI
|
||||
|
||||
|
@ -274,9 +273,6 @@ function install-preferences {
|
|||
fi
|
||||
|
||||
if [ $EXTRA == 1 ]; then
|
||||
# Extra dev
|
||||
inst cmake clang llvm
|
||||
|
||||
# Extra CLI
|
||||
inst sl ffmpeg youtube-dl
|
||||
|
||||
|
|
Loading…
Reference in a new issue