- don't set vim alias for root
This commit is contained in:
parent
ad72ee5821
commit
8e2227aca9
6
vim.spec
6
vim.spec
@ -315,8 +315,8 @@ autoconf
|
|||||||
perl -pi -e "s,\\\$VIMRUNTIME,/usr/share/vim/%{vimdir},g" os_unix.h
|
perl -pi -e "s,\\\$VIMRUNTIME,/usr/share/vim/%{vimdir},g" os_unix.h
|
||||||
perl -pi -e "s,\\\$VIM,/usr/share/vim/%{vimdir}/macros,g" os_unix.h
|
perl -pi -e "s,\\\$VIM,/usr/share/vim/%{vimdir}/macros,g" os_unix.h
|
||||||
|
|
||||||
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
|
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2"
|
||||||
export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
|
export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2"
|
||||||
%if "%{withruby}" == "1"
|
%if "%{withruby}" == "1"
|
||||||
export RUBY_CFLAGS=-I$(ruby -r rbconfig -e 'p Config::CONFIG["archdir"]')
|
export RUBY_CFLAGS=-I$(ruby -r rbconfig -e 'p Config::CONFIG["archdir"]')
|
||||||
%endif
|
%endif
|
||||||
@ -467,12 +467,14 @@ chmod 644 ../runtime/doc/vim2html.pl
|
|||||||
|
|
||||||
mkdir -p $RPM_BUILD_ROOT/etc/profile.d
|
mkdir -p $RPM_BUILD_ROOT/etc/profile.d
|
||||||
cat >$RPM_BUILD_ROOT/etc/profile.d/vim.sh <<EOF
|
cat >$RPM_BUILD_ROOT/etc/profile.d/vim.sh <<EOF
|
||||||
|
[ -w /etc/passwd ] && return
|
||||||
if [ -n "\$BASH_VERSION" -o -n "\$KSH_VERSION" -o -n "\$ZSH_VERSION" ]; then
|
if [ -n "\$BASH_VERSION" -o -n "\$KSH_VERSION" -o -n "\$ZSH_VERSION" ]; then
|
||||||
# for bash, pdksh and zsh, only if no alias is already set
|
# for bash, pdksh and zsh, only if no alias is already set
|
||||||
alias vi >/dev/null 2>&1 || alias vi=vim
|
alias vi >/dev/null 2>&1 || alias vi=vim
|
||||||
fi
|
fi
|
||||||
EOF
|
EOF
|
||||||
cat >$RPM_BUILD_ROOT/etc/profile.d/vim.csh <<EOF
|
cat >$RPM_BUILD_ROOT/etc/profile.d/vim.csh <<EOF
|
||||||
|
[ -w /etc/passwd ] && return
|
||||||
alias vi vim
|
alias vi vim
|
||||||
EOF
|
EOF
|
||||||
chmod 0755 $RPM_BUILD_ROOT/etc/profile.d/*
|
chmod 0755 $RPM_BUILD_ROOT/etc/profile.d/*
|
||||||
|
Loading…
Reference in New Issue
Block a user