configs  Check-in [ea72aa4093]

Overview
Comment:zshrc: Provide fallback when colordiff is missing
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: ea72aa4093c68ee20ccc3678896878fb8925b23ca9ab71297a31f45b294cfddf
User & Date: js 2020-05-24 13:19:47
Context
2020-05-24
13:30
zshrc: Make colordiff fallback work on MSYS2 check-in: 57c7dd0298 user: js tags: trunk
13:19
zshrc: Provide fallback when colordiff is missing check-in: ea72aa4093 user: js tags: trunk
11:34
Fix spacing errors check-in: 8ed8fb5afa user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to zshrc.

︙︙
203
204
205
206
207
208
209

210






211
212
213
214
215
216
217


alias tmux="tmux -f $XDG_CONFIG_HOME/tmux/tmux.conf"

if which fossil &>/dev/null; then
	alias fsl="fossil"

	fsld() {

		fossil diff -N "$@" | colordiff | less -FRX






	}
fi

# pkgsrc does not like MAKEFLAGS including -j
which pkg_chk &>/dev/null && alias pkg_chk="MAKEFLAGS= pkg_chk"
which pkg_rolling-replace &>/dev/null &&
	alias pkg_rolling-replace="MAKEFLAGS= pkg_rolling-replace"








>
|
>
>
>
>
>
>








203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224


alias tmux="tmux -f $XDG_CONFIG_HOME/tmux/tmux.conf"

if which fossil &>/dev/null; then
	alias fsl="fossil"

	fsld() {
		if which colordiff &>/dev/null; then
			fossil diff -N "$@" | colordiff | less -FRX
		else
			fossil diff -N "$@" |
				sed "s/^+.*$/$(tput setaf 2)&$(tput sgr0)/" |
				sed "s/^-.*$/$(tput setaf 1)&$(tput sgr0)/" |
				less -FRX
		fi
	}
fi

# pkgsrc does not like MAKEFLAGS including -j
which pkg_chk &>/dev/null && alias pkg_chk="MAKEFLAGS= pkg_chk"
which pkg_rolling-replace &>/dev/null &&
	alias pkg_rolling-replace="MAKEFLAGS= pkg_rolling-replace"
︙︙