From 80186e978c708206695c1a7f4b67473f05f7ffad Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Fri, 25 Aug 2023 14:39:07 +0200 Subject: [PATCH] Fixing management of vimrc in EL-9 --- files/vimrc-el9 | 155 ---------------------------------- files/vimrc.local-el9 | 36 ++++++++ snippets/tpl.231.vimrc-el9.sh | 12 +-- 3 files changed, 43 insertions(+), 160 deletions(-) delete mode 100644 files/vimrc-el9 create mode 100644 files/vimrc.local-el9 diff --git a/files/vimrc-el9 b/files/vimrc-el9 deleted file mode 100644 index 741ba20..0000000 --- a/files/vimrc-el9 +++ /dev/null @@ -1,155 +0,0 @@ -" When started as "evim", evim.vim will already have done these settings. -if v:progname =~? "evim" - finish -endif - -" Use Vim settings, rather than Vi settings (much better!). -" This must be first, because it changes other options as a side effect. -" Avoid side effects when it was already reset. -if &compatible - set nocompatible -endif - -" When the +eval feature is missing, the set command above will be skipped. -" Use a trick to reset compatible only when the +eval feature is missing. -silent! while 0 - set nocompatible -silent! endwhile - -if v:lang =~ "utf8$" || v:lang =~ "UTF-8$" - set fileencodings=ucs-bom,utf-8,latin1 -endif - -set bs=indent,eol,start " allow backspacing over everything in insert mode -"set ai " always set autoindenting on -set noai " always set autoindenting off -"set backup " keep a backup file -set viminfo='20,\"50 " read/write a .viminfo file, don't store more - " than 50 lines of registers -set history=50 " keep 50 lines of command line history -set ruler " show the cursor position all the time -set modeline -set showmatch -set ignorecase -set showcmd " display incomplete commands -set wildmenu " display completion matches in a status line - -set ttimeout " time out for key codes -set ttimeoutlen=100 " wait up to 100ms after Esc for special key - -" Show @@@ in the last line if it is truncated. -set display=truncate - -" Show a few lines of context around the cursor. Note that this makes the -" text scroll if you mouse-click near the start or end of the window. -set scrolloff=5 - -" Do incremental searching when it's possible to timeout. -if has('reltime') - set incsearch -endif - -" Do not recognize octal numbers for Ctrl-A and Ctrl-X, most users find it -" confusing. -set nrformats-=octal - - -if has("multi_byte") - set encoding=utf-8 - setglobal fileencoding=utf-8 - set listchars=tab:»·,trail:·,nbsp:⎵ -else - echoerr "Sorry, this version of (g)vim was not compiled with +multi_byte" - set listchars=tab:>-,trail:. -endif - -color delek - -syntax on - -" Always show statusline -set laststatus=2 - -set t_Co=256 - -" Only do this part when compiled with support for autocommands -if has("autocmd") - augroup redhat - autocmd! - " In text files, always limit the width of text to 78 characters - " autocmd BufRead *.txt set tw=78 - " When editing a file, always jump to the last cursor position - autocmd BufReadPost * - \ if line("'\"") > 0 && line ("'\"") <= line("$") | - \ exe "normal! g'\"" | - \ endif - " don't write swapfile on most commonly used directories for NFS mounts or USB sticks - autocmd BufNewFile,BufReadPre /media/*,/run/media/*,/mnt/* set directory=~/tmp,/var/tmp,/tmp - " start with spec file template - autocmd BufNewFile *.spec 0r /usr/share/vim/vimfiles/template.spec - augroup END -endif - -if has("cscope") && filereadable("/usr/bin/cscope") - set csprg=/usr/bin/cscope - set csto=0 - set cst - set nocsverb - " add any database in current directory - if filereadable("cscope.out") - cs add $PWD/cscope.out - " else add database pointed to by environment - elseif $CSCOPE_DB != "" - cs add $CSCOPE_DB - endif - set csverb -endif - -" Switch syntax highlighting on, when the terminal has colors -" Also switch off highlighting the last used search pattern. -if &t_Co > 2 || has("gui_running") - syntax on - - " I like highlighting strings inside C comments. - " Revert with ":unlet c_comment_strings". - let c_comment_strings=1 - " set hlsearch - set nohlsearch -endif - -filetype plugin on - -if &term=="xterm" - " set t_Co=8 - set t_Sb=[4%dm - set t_Sf=[3%dm -endif - -" Convenient command to see the difference between the current buffer and the -" file it was loaded from, thus the changes you made. -" Only define it when not defined already. -" Revert with: ":delcommand DiffOrig". -if !exists(":DiffOrig") - command DiffOrig vert new | set bt=nofile | r ++edit # | 0d_ | diffthis - \ | wincmd p | diffthis -endif - -if has('langmap') && exists('+langremap') - " Prevent that the langmap option applies to characters that result from a - " mapping. If set (default), this may break plugins (but it's backward - " compatible). - set nolangremap -endif - -" Don't wake up system with blinking cursor: -" http://www.linuxpowertop.org/known.php -let &guicursor = &guicursor . ",a:blinkon0" - -" Set the filetype based on the file's extension, but only if -" 'filetype' has not already been set -au BufRead,BufNewFile *.repo setfiletype dosini - -" Source a global configuration file if available -if filereadable("/etc/vimrc.local") - source /etc/vimrc.local -endif diff --git a/files/vimrc.local-el9 b/files/vimrc.local-el9 new file mode 100644 index 0000000..d013903 --- /dev/null +++ b/files/vimrc.local-el9 @@ -0,0 +1,36 @@ + +if v:lang =~ "utf8$" || v:lang =~ "UTF-8$" + set fileencodings=ucs-bom,utf-8,latin1 +endif + +set noai " always set autoindenting off +set modeline +set showmatch +set ignorecase + +if has("multi_byte") + set encoding=utf-8 + setglobal fileencoding=utf-8 + set listchars=tab:»·,trail:·,nbsp:⎵ +else + echoerr "Sorry, this version of (g)vim was not compiled with +multi_byte" + set listchars=tab:>-,trail:. +endif + +color delek + +syntax on + +" Always show statusline +set laststatus=2 + +set t_Co=256 + +autocmd BufNewFile *.spec 0r /usr/share/vim/vimfiles/template.spec + +set nohlsearch + +" Set the filetype based on the file's extension, but only if +" 'filetype' has not already been set +au BufRead,BufNewFile *.repo setfiletype dosini + diff --git a/snippets/tpl.231.vimrc-el9.sh b/snippets/tpl.231.vimrc-el9.sh index 352ea9e..a145bff 100644 --- a/snippets/tpl.231.vimrc-el9.sh +++ b/snippets/tpl.231.vimrc-el9.sh @@ -9,17 +9,19 @@ set_vimrc_el9() { echo "${HASH_LINE}" echo "Calling set_vimrc_el9() ..." echo - local url="${cobbler_url}/${ws_rel_filesdir}/${system_status}/vimrc-centos9" + local url="${cobbler_url}/${ws_rel_filesdir}/${system_status}/vimrc.local-centos9" echo - log "Rewriting /etc/vimrc ..." + log "Writing /etc/vimrc.local ..." local tmp_file=$( mktemp ) wget -O "${tmp_file}" --dns-timeout=2 --connect-timeout=3 --read-timeout=3 "${url}" || true if [[ -s "${tmp_file}" ]] ; then - cp -p /etc/vimrc /etc/vimrc.original - mv -v "${tmp_file}" /etc/vimrc - chmod -v 0644 /etc/vimrc + if [[ -f '/etc/vimrc.local' ]] ; then + cp -p '/etc/vimrc.local' '/etc/vimrc.local.original' + fi + mv -v "${tmp_file}" '/etc/vimrc.local' + chmod -v 0644 '/etc/vimrc.local' fi rm -fv "${tmp_file}" -- 2.39.5