From 819424c94ffca91cc7cc4b7ab78cbc5563dbc169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Mon, 23 Nov 2020 10:58:04 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D1=8B=20fo?= =?UTF-8?q?rmat=3Draw=20=D0=B8=20append=3Dreplace=20=D0=B2=20=D1=88=D0=B0?= =?UTF-8?q?=D0=B1=D0=BB=D0=BE=D0=BD=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- merge/app-backup/rsnapshot/rsnapshot.d/localhost.conf | 1 + merge/app-editors/vim/99editor | 2 +- merge/app-editors/vim/vimrc.local | 2 +- merge/app-emulation/lxc/lxc.conf | 2 +- merge/app-misc/tmux/tmux.conf | 2 +- merge/app-portage/eix/50-calculate | 2 +- merge/app-portage/eix/eix-sync.conf | 2 +- merge/app-shells/bash/bashrc.d/glxgears.sh | 2 +- merge/app-shells/bash/bashrc.d/screen_preexec.sh | 2 +- merge/app-shells/bash/bashrc.d/tmux_color.sh | 2 +- merge/app-shells/bash/bashrc.d/wgetpaste_color.sh | 2 +- merge/app-shells/bash/bashrc.d/xz_threads.sh | 2 +- merge/app-text/qpdfview/qpdfview.svg | 2 +- 13 files changed, 13 insertions(+), 12 deletions(-) diff --git a/merge/app-backup/rsnapshot/rsnapshot.d/localhost.conf b/merge/app-backup/rsnapshot/rsnapshot.d/localhost.conf index 9341ace..e38ac6c 100644 --- a/merge/app-backup/rsnapshot/rsnapshot.d/localhost.conf +++ b/merge/app-backup/rsnapshot/rsnapshot.d/localhost.conf @@ -1,3 +1,4 @@ +{% calculate comment="#" %} # LOCALHOST #backup / localhost/rootfs/ #backup /var/calculate localhost/calculate/ diff --git a/merge/app-editors/vim/99editor b/merge/app-editors/vim/99editor index 6a3ce10..60a20a1 100644 --- a/merge/app-editors/vim/99editor +++ b/merge/app-editors/vim/99editor @@ -1,3 +1,3 @@ -{% calculate path='/etc/env.d', format='raw', append='replace' %} +{% calculate path='/etc/env.d' %} EDITOR="/usr/bin/vim" diff --git a/merge/app-editors/vim/vimrc.local b/merge/app-editors/vim/vimrc.local index e1cc945..b643ffe 100644 --- a/merge/app-editors/vim/vimrc.local +++ b/merge/app-editors/vim/vimrc.local @@ -1,4 +1,4 @@ -{% calculate comment='"', path='/etc/vim', format='raw', append='replace' %} +{% calculate comment='"', path='/etc/vim' %} set t_Co=256 {% if pkg('app-vim/colorschemes') %} colorscheme desert256 diff --git a/merge/app-emulation/lxc/lxc.conf b/merge/app-emulation/lxc/lxc.conf index 7da645e..b2db9c5 100644 --- a/merge/app-emulation/lxc/lxc.conf +++ b/merge/app-emulation/lxc/lxc.conf @@ -1,3 +1,3 @@ -{% calculate comment='#', format='raw', append='replace' %} +{% calculate comment='#' %} lxc.lxcpath = /var/calculate/lxc diff --git a/merge/app-misc/tmux/tmux.conf b/merge/app-misc/tmux/tmux.conf index c034cbf..1f40926 100644 --- a/merge/app-misc/tmux/tmux.conf +++ b/merge/app-misc/tmux/tmux.conf @@ -1,4 +1,4 @@ -{% calculate format='raw', append='replace', comment='#' %} +{% calculate comment='#' %} set -g default-terminal "screen-256color" set -g history-limit 10000 #set-window-option -g utf8 on diff --git a/merge/app-portage/eix/50-calculate b/merge/app-portage/eix/50-calculate index 7cbc9ff..b706fc8 100644 --- a/merge/app-portage/eix/50-calculate +++ b/merge/app-portage/eix/50-calculate @@ -1,4 +1,4 @@ -{% calculate comment='#', append='replace', format='raw', path='/etc/eixrc', pkg() >= '0.29' %} +{% calculate comment='#', path='/etc/eixrc', pkg() >= '0.29' %} COLORSCHEME1="true" NOSTATUSLINE=true EIX_LIMIT=0 diff --git a/merge/app-portage/eix/eix-sync.conf b/merge/app-portage/eix/eix-sync.conf index dc80900..9c955a7 100644 --- a/merge/app-portage/eix/eix-sync.conf +++ b/merge/app-portage/eix/eix-sync.conf @@ -1,4 +1,4 @@ -{% calculate comment='#', format='raw', append='replace' %} +{% calculate comment='#' %} # checkout and repair repositories before sync !have_changed=: !emergecmd='/usr/sbin/cl-core --method update --sync-only --skip-eix-update' diff --git a/merge/app-shells/bash/bashrc.d/glxgears.sh b/merge/app-shells/bash/bashrc.d/glxgears.sh index f182abc..6bb13e0 100644 --- a/merge/app-shells/bash/bashrc.d/glxgears.sh +++ b/merge/app-shells/bash/bashrc.d/glxgears.sh @@ -1,4 +1,4 @@ -{% calculate comment='#', format='raw', append='replace' %} +{% calculate comment='#' %} #!/bin/bash alias glxgears='vblank_mode=0 glxgears' diff --git a/merge/app-shells/bash/bashrc.d/screen_preexec.sh b/merge/app-shells/bash/bashrc.d/screen_preexec.sh index 5749a54..829f4ab 100644 --- a/merge/app-shells/bash/bashrc.d/screen_preexec.sh +++ b/merge/app-shells/bash/bashrc.d/screen_preexec.sh @@ -1,4 +1,4 @@ -{% calculate comment='#', format='raw', append='replace' %} +{% calculate comment='#' %} #!/bin/bash # the script used for the automatic changing of screen tab names diff --git a/merge/app-shells/bash/bashrc.d/tmux_color.sh b/merge/app-shells/bash/bashrc.d/tmux_color.sh index 2e463c9..d5671e2 100644 --- a/merge/app-shells/bash/bashrc.d/tmux_color.sh +++ b/merge/app-shells/bash/bashrc.d/tmux_color.sh @@ -1,4 +1,4 @@ -{% calculate comment='#', format='raw', append='replace' %} +{% calculate comment='#' %} #!/bin/bash case ${COLORTERM} in diff --git a/merge/app-shells/bash/bashrc.d/wgetpaste_color.sh b/merge/app-shells/bash/bashrc.d/wgetpaste_color.sh index 7052f33..4742ce6 100644 --- a/merge/app-shells/bash/bashrc.d/wgetpaste_color.sh +++ b/merge/app-shells/bash/bashrc.d/wgetpaste_color.sh @@ -1,4 +1,4 @@ -{% calculate comment='#', format='raw', append='replace' %} +{% calculate comment='#' %} #!/bin/bash # use color output for pastebin.calculate-linux.org by wgetpaste diff --git a/merge/app-shells/bash/bashrc.d/xz_threads.sh b/merge/app-shells/bash/bashrc.d/xz_threads.sh index 4fc330a..673719a 100644 --- a/merge/app-shells/bash/bashrc.d/xz_threads.sh +++ b/merge/app-shells/bash/bashrc.d/xz_threads.sh @@ -1,4 +1,4 @@ -{% calculate comment='#', format='raw', append='replace' %} +{% calculate comment='#' %} #!/bin/bash export XZ_OPT="--threads=0 -8" diff --git a/merge/app-text/qpdfview/qpdfview.svg b/merge/app-text/qpdfview/qpdfview.svg index 5c8c843..4ebf0ab 100644 --- a/merge/app-text/qpdfview/qpdfview.svg +++ b/merge/app-text/qpdfview/qpdfview.svg @@ -1,4 +1,4 @@ -{% calculate format='raw', append='replace' %} +{% calculate comment='' %}