fix git url setup

[etc/mrsetup.git] / mrsetup

diff --git a/mrsetup b/mrsetup
index 5a17d073f705277d4879037fd1c1c30bb661faba..240dd9f70466702d622f348bbe4ab05301bbff43 100755 (executable)
--- a/mrsetup
+++ b/mrsetup
@@ -7,15 +7,13 @@
 #
 set -eu
 
 #
 set -eu
 

-MY_GIT_SERVER=git.madduck.net
-MY_GIT_REPOS='~/git'

 MY_ACCOUNT="$(whoami)@$(hostname --fqdn)"
 MY_ACCOUNT_GIT_REPO=${MY_GIT_REPOS}/accounts/${MY_ACCOUNT}.git
 MY_ACCOUNT="$(whoami)@$(hostname --fqdn)"
 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_CODE=code/mr
+MY_GIT_URL_BASE=madduck:
+MY_MR_REPO_URL=${MY_GIT_URL_BASE}pub/etc/mr.git
+#MY_ACCOUNT_REPO_URL=$MY_GIT_URL_BASE/$MY_ACCOUNT_GIT_REPO
+MR_REPO_URL=${MY_GIT_URL_BASE}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 +28,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,7 +55,8 @@ 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
+  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
   mkdir --parent $BIN_DIR
   ln -s ../${MR_CODE}/mr $BIN_DIR/mr
   echo