From: Iain Patterson <me@iain.cx>
Date: Thu, 10 Dec 2009 14:53:39 +0000 (+0000)
Subject: Remove gratuitous exports.
X-Git-Url: http://git.iain.cx/?a=commitdiff_plain;h=0614eba6741fe0b5f1ef54ad7478fe003ca0e613;p=profile.git

Remove gratuitous exports.

Don't export variables which exist only for the shell's benefit.
---

diff --git a/.profile.d/bash3.bashrc b/.profile.d/bash3.bashrc
index 15626d4..97e3e67 100644
--- a/.profile.d/bash3.bashrc
+++ b/.profile.d/bash3.bashrc
@@ -1,4 +1,4 @@
-export HISTCONTROL=ignoredups
-export HISTTIMEFORMAT='[%Y-%m-%d %H:%M:%S] '
-export HISTFILESIZE=3000
-export HISTSIZE=1000
+HISTCONTROL=ignoredups
+HISTTIMEFORMAT='[%Y-%m-%d %H:%M:%S] '
+HISTFILESIZE=3000
+HISTSIZE=1000
diff --git a/.profile.d/completion.bashrc b/.profile.d/completion.bashrc
index 0f71b59..3c3ec33 100644
--- a/.profile.d/completion.bashrc
+++ b/.profile.d/completion.bashrc
@@ -2,10 +2,10 @@
 if ! builtin complete 2>&1 | grep 'not a shell builtin' >/dev/null; then
 
 # Helper!
-export COMPLETION_DIR_SSH=~/.ssh/hosts
-export COMPLETION_DIR_TELNET=~/.telnet/hosts
-export COMPLETION_DIR_RDP=~/.rdp/hosts
-export COMPLETION_DIR_PING="$COMPLETION_DIR_SSH $COMPLETION_DIR_TELNET $COMPLETION_DIR_RDP"
+COMPLETION_DIR_SSH=~/.ssh/hosts
+COMPLETION_DIR_TELNET=~/.telnet/hosts
+COMPLETION_DIR_RDP=~/.rdp/hosts
+COMPLETION_DIR_PING="$COMPLETION_DIR_SSH $COMPLETION_DIR_TELNET $COMPLETION_DIR_RDP"
 
 function _generic_completion() {
   COMPLETION_DIR=${1+"$@"}
diff --git a/.profile.d/prompt.bashrc b/.profile.d/prompt.bashrc
index 6398e3d..44773fc 100644
--- a/.profile.d/prompt.bashrc
+++ b/.profile.d/prompt.bashrc
@@ -31,9 +31,9 @@ if ps -o comm= -p $PPID 2>/dev/null | grep '^vim*$' &>/dev/null; then
   info="$info$vimchild"
 fi
 if [ "${TERM##screen}" = "$TERM" ]; then
-  export PROMPT_COMMAND="echo -ne '\033]0;$info\033\0134\r\033[K'"
+  PROMPT_COMMAND="echo -ne '\033]0;$info\033\0134\r\033[K'"
 else
-  export PROMPT_COMMAND='echo -ne "\033k\033\0134"'
+  PROMPT_COMMAND='echo -ne "\033k\033\0134"'
 fi
 unset blank info vimchild SSH_FORWARDED
 
diff --git a/.profile.d/ps1.bashrc b/.profile.d/ps1.bashrc
index 87a2f1b..b65e42d 100644
--- a/.profile.d/ps1.bashrc
+++ b/.profile.d/ps1.bashrc
@@ -45,27 +45,27 @@
 # SVN: magenta.
 case $(tput colors) in
   256)
-    export PROMPT_OK_COLOUR="1;38;5;34"
-    export PROMPT_FAILED_COLOUR="1;38;5;160"
-    export GIT_COLOUR="0;38;5;33"
-    export SVN_COLOUR="0;38;5;127"
-    export P4_COLOUR="0;38;5;142"
+    PROMPT_OK_COLOUR="1;38;5;34"
+    PROMPT_FAILED_COLOUR="1;38;5;160"
+    GIT_COLOUR="0;38;5;33"
+    SVN_COLOUR="0;38;5;127"
+    P4_COLOUR="0;38;5;142"
   ;;
 
   88)
-    export PROMPT_OK_COLOUR="1;38;5;24"
-    export PROMPT_FAILED_COLOUR="1;38;5;48"
-    export GIT_COLOUR="0;38;5;23"
-    export SVN_COLOUR="0;38;5;49"
-    export P4_COLOUR="0;38;5;56"
+    PROMPT_OK_COLOUR="1;38;5;24"
+    PROMPT_FAILED_COLOUR="1;38;5;48"
+    GIT_COLOUR="0;38;5;23"
+    SVN_COLOUR="0;38;5;49"
+    P4_COLOUR="0;38;5;56"
   ;;
 
   *)
-    export PROMPT_OK_COLOUR="1;32"
-    export PROMPT_FAILED_COLOUR="1;31"
-    export GIT_COLOUR="0;36"
-    export SVN_COLOUR="0;35"
-    export P4_COLOUR="0;33"
+    PROMPT_OK_COLOUR="1;32"
+    PROMPT_FAILED_COLOUR="1;31"
+    GIT_COLOUR="0;36"
+    SVN_COLOUR="0;35"
+    P4_COLOUR="0;33"
   ;;
 esac
 
@@ -73,7 +73,7 @@ function __ps1() {
   # Default __ps1_user to 1.
   [ -z "$__ps1_user" ] && __ps1_user=1
 
-  export PS1='$(__ps1_user $? \u@)\[\033[$(__ps1_col $? 2>/dev/null)m\]$(__ps1_user $? \h)\[\033[$(__ps1_colour_escape $? $GIT_COLOUR)m\]$(__ps1_git $? 2>/dev/null)\[\033[0m\]\[\033[$(__ps1_colour_escape $? $P4_COLOUR)m\]$(__ps1_p4 $? 2>/dev/null)\[\033[0m\]\[\033[$(__ps1_colour_escape $? $SVN_COLOUR)m\]$(__ps1_svn $? 2>/dev/null)\[\033[0m\]$(__ps1_ret $? 2>/dev/null):\w\$ '
+  PS1='$(__ps1_user $? \u@)\[\033[$(__ps1_col $? 2>/dev/null)m\]$(__ps1_user $? \h)\[\033[$(__ps1_colour_escape $? $GIT_COLOUR)m\]$(__ps1_git $? 2>/dev/null)\[\033[0m\]\[\033[$(__ps1_colour_escape $? $P4_COLOUR)m\]$(__ps1_p4 $? 2>/dev/null)\[\033[0m\]\[\033[$(__ps1_colour_escape $? $SVN_COLOUR)m\]$(__ps1_svn $? 2>/dev/null)\[\033[0m\]$(__ps1_ret $? 2>/dev/null):\w\$ '
   return 0
 }