From f3b5dd743f552ba7d8bb7d4c68a224bfd06e677e Mon Sep 17 00:00:00 2001
From: James Ottaway <git@james.ottaway.io>
Date: Sat, 8 Aug 2015 23:11:53 +1000
Subject: [PATCH] Default FILE to `tmux.conf` before `.tmux.conf`

---
 tmux-up | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tmux-up b/tmux-up
index 9f00d07..5188121 100755
--- a/tmux-up
+++ b/tmux-up
@@ -18,7 +18,7 @@ then
 
 		The FILE argument is used to bootstrap the new tmux session if it doesn't
 		already exist. It must contain tmux-compatible commands, which will be
-		passed to tmux. Defaults to: .tmux.conf
+		passed to tmux. Defaults to: tmux.conf OR .tmux.conf
 
 		  --help     display this help and exit
 		  --version  output version information and exit
@@ -41,11 +41,14 @@ fi
 if [ -f "$1" ]
 then
   FILE=$1
+elif [ -f 'tmux.conf' ]
+then
+  FILE='tmux.conf'
 elif [ -f '.tmux.conf' ]
 then
   FILE='.tmux.conf'
 else
-  echo "$0: cannot stat ‘${1:-.tmux.conf}’: No such file"
+  echo "$0: cannot stat ‘${1:-tmux.conf}’: No such file"
   exit 1
 fi