do not fail when .bin already exists

[etc/mrsetup.git] / mrsetup

diff --git a/mrsetup b/mrsetup
index d1fbb1b6da756292581edfa50430b6ad3ae6822d..23354846d008955aaa7b3e188165fa8282988fed 100755 (executable)
--- a/mrsetup
+++ b/mrsetup
@@ -56,7 +56,7 @@ else
   echo I: cloning mr into ${MR_CODE}...
   mkdir --parent ${MR_CODE%/*}
   git clone $MR_REPO_URL $MR_CODE
-  mkdir .bin
+  mkdir --parent $BIN_DIR
   ln -s ../${MR_CODE}/mr $BIN_DIR/mr
   echo
 fi
@@ -82,7 +82,7 @@ cp $MR/templ/.mrconfig .
 echo I: setting up base...
 $MR_CODE/mr co
 
-if ! ssh $MY_GIT_SERVER "test -d $MY_ACCOUNT_GIT_REPO" </dev/null; then
+if ssh $MY_GIT_SERVER "test -d $MY_ACCOUNT_GIT_REPO" </dev/null; then
   echo I: checking out local git repository...
   dir="$(mktemp -d home.XXXXXXXX)"
   trap "rm -rf $dir" 0
@@ -98,7 +98,7 @@ else
   ssh $MY_GIT_SERVER "
     GIT_DIR=${MY_ACCOUNT_GIT_REPO} git --bare init
     echo 'account setup for $MY_ACCOUNT'
-    "
+    " </dev/null
   echo I: setting up local git repository...
   git init
   git remote add origin $MY_ACCOUNT_REPO_URL
@@ -111,7 +111,7 @@ else
 fi
 
 echo I: spawning a shell...
-$SHELL --interactive --login
+$SHELL --interactive --login </dev/tty >/dev/tty
 
 echo I: back from the shell.