]> git.madduck.net Git - etc/mrsetup.git/blobdiff - mrsetup

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

make sure we are in ~
[etc/mrsetup.git] / mrsetup
diff --git a/mrsetup b/mrsetup
index b3264712bc656f92584010c175d8c0269a0035fe..a1ba709d0ab32f9b4450f8315d8134b1616c7429 100755 (executable)
--- a/mrsetup
+++ b/mrsetup
@@ -14,7 +14,7 @@ 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
-MR_REPO_URL=git://git.kitenet.net/mr
+MR_REPO_URL=ssh://git.madduck.net/~/git/pub/code/mr.git
 MR_CODE=code/mr
 MR_FGIT=.fgits/mr.git
 MR=.mr
@@ -30,6 +30,8 @@ if [ ! -x "$(command -v git)" ]; then
   exit 2
 fi
 
+cd $HOME
+
 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%/*}
-  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
@@ -98,7 +101,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 +114,7 @@ else
 fi
 
 echo I: spawning a shell...
-$SHELL --interactive --login
+$SHELL -i -l </dev/tty >/dev/tty
 
 echo I: back from the shell.