make mrcode location absolute

[etc/mrsetup.git] / mrsetup

diff --git a/mrsetup b/mrsetup
index b3264712bc656f92584010c175d8c0269a0035fe..651902b7ea67c7a62d6ac477d1466095ef46b6e7 100755 (executable)
--- a/mrsetup
+++ b/mrsetup
@@ -14,8 +14,8 @@ MY_ACCOUNT_GIT_REPO=${MY_GIT_REPOS}/accounts/${MY_ACCOUNT}.git
 MY_GIT_URL_BASE=ssh://$MY_GIT_SERVER
 MY_MR_REPO_URL=$MY_GIT_URL_BASE/$MY_GIT_REPOS/pub/etc/mr.git
 MY_ACCOUNT_REPO_URL=$MY_GIT_URL_BASE/$MY_ACCOUNT_GIT_REPO
 MY_GIT_URL_BASE=ssh://$MY_GIT_SERVER
 MY_MR_REPO_URL=$MY_GIT_URL_BASE/$MY_GIT_REPOS/pub/etc/mr.git
 MY_ACCOUNT_REPO_URL=$MY_GIT_URL_BASE/$MY_ACCOUNT_GIT_REPO

-MR_REPO_URL=git://git.kitenet.net/mr
-MR_CODE=code/mr
+MR_REPO_URL=$MY_GIT_URL_BASE/~/git/pub/code/mr.git
+MR_CODE=$HOME/code/mr

 MR_FGIT=.fgits/mr.git
 MR=.mr
 BIN_DIR=.bin
 MR_FGIT=.fgits/mr.git
 MR=.mr
 BIN_DIR=.bin


@@ -30,6 +30,8 @@ if [ ! -x "$(command -v git)" ]; then
   exit 2
 fi
 
   exit 2
 fi
 

+cd $HOME
+

 if [ -e .mrconfig ]; then
   echo E: .mrconfig already exists. >&2
   exit 3
 if [ -e .mrconfig ]; then
   echo E: .mrconfig already exists. >&2
   exit 3


@@ -55,8 +57,9 @@ if [ -d code/mr ]; then
 else
   echo I: cloning mr into ${MR_CODE}...
   mkdir --parent ${MR_CODE%/*}
 else
   echo I: cloning mr into ${MR_CODE}...
   mkdir --parent ${MR_CODE%/*}

-  git clone $MR_REPO_URL $MR_CODE
-  mkdir .bin
+  git clone --no-checkout $MR_REPO_URL $MR_CODE
+  (cd $MR_CODE && git checkout -b vcsh origin/vcsh)
+  mkdir --parent $BIN_DIR

   ln -s ../${MR_CODE}/mr $BIN_DIR/mr
   echo
 fi
   ln -s ../${MR_CODE}/mr $BIN_DIR/mr
   echo
 fi


@@ -98,7 +101,7 @@ else
   ssh $MY_GIT_SERVER "
     GIT_DIR=${MY_ACCOUNT_GIT_REPO} git --bare init
     echo 'account setup for $MY_ACCOUNT'
   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
   echo I: setting up local git repository...
   git init
   git remote add origin $MY_ACCOUNT_REPO_URL


@@ -111,7 +114,7 @@ else
 fi
 
 echo I: spawning a shell...
 fi
 
 echo I: spawning a shell...

-$SHELL --interactive --login
+$SHELL -i -l </dev/tty >/dev/tty

 
 echo I: back from the shell.
 
 
 echo I: back from the shell.