From 8fe71670e11ed39b39d528d3f7599f4be5b98d83 Mon Sep 17 00:00:00 2001 From: Iain Patterson Date: Thu, 20 Nov 2008 13:59:19 +0000 Subject: [PATCH] Added p4 settings to version control. git-svn-id: https://svn.cambridge.iain.cx/profile/trunk@151 6be0d1a5-5cfe-0310-89b6-964be062b18b --- .profile.d/p4.bashrc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .profile.d/p4.bashrc diff --git a/.profile.d/p4.bashrc b/.profile.d/p4.bashrc new file mode 100644 index 0000000..53967d1 --- /dev/null +++ b/.profile.d/p4.bashrc @@ -0,0 +1,15 @@ +# $Id$ +if [ ! -z "$SUDO_USER" ]; then + export P4USER=$SUDO_USER + export P4TICKETS=/tmp/.p4tickets.$SUDO_USER +else + export P4USER=$USER +fi +export P4CONFIG=.p4config +export P4DIFF="diff -u" +export P4EDITOR="vim -S '$HOME/.vim/script/p4'" +if [ -z "$DISPLAY" ]; then + export P4MERGE="vim -o -c '3wincmd j' -c 'wincmd L'" +else + export P4MERGE="p4v -merge" +fi -- 2.20.1