X-Git-Url: https://git.madduck.net/etc/mrsetup.git/blobdiff_plain/4e1c3aa9b47012a256925938ac609cab8a658cc6..4602ff94b01b431c8f26997fb8cced9661c8d9f7:/mrsetup diff --git a/mrsetup b/mrsetup index 2335484..a91f803 100755 --- 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 @@ -55,7 +55,8 @@ if [ -d code/mr ]; then else echo I: cloning mr into ${MR_CODE}... mkdir --parent ${MR_CODE%/*} - git clone $MR_REPO_URL $MR_CODE + 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 @@ -111,7 +112,7 @@ else fi echo I: spawning a shell... -$SHELL --interactive --login /dev/tty +$SHELL -i -l /dev/tty echo I: back from the shell.