remove redundance server URI

[etc/mrsetup.git] / mrsetup

diff --git a/mrsetup b/mrsetup
index 61380437207e74a0c33f0dabe9762ca8b6e43df0..7910c008867f0750a313fceb0ee76422cbad4f0d 100755 (executable)
--- a/mrsetup
+++ b/mrsetup
@@ -9,11 +9,12 @@ set -eu
 
 MY_GIT_SERVER=git.madduck.net
 MY_GIT_REPOS='~/git'
 
 MY_GIT_SERVER=git.madduck.net
 MY_GIT_REPOS='~/git'

-MY_ACCOUNT_GIT_REPO=$MY_GIT_REPOS/accounts/$(whoami)@$(hostname --fqdn).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
 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=$MY_GIT_URL_BASE/~/git/pub/code/mr.git

 MR_CODE=code/mr
 MR_FGIT=.fgits/mr.git
 MR=.mr
 MR_CODE=code/mr
 MR_FGIT=.fgits/mr.git
 MR=.mr


@@ -29,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


@@ -54,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


@@ -81,7 +85,7 @@ cp $MR/templ/.mrconfig .
 echo I: setting up base...
 $MR_CODE/mr co
 
 echo I: setting up base...
 $MR_CODE/mr co
 

-if ssh $MY_GIT_SERVER "test -d $MY_ACCOUNT_GIT_REPO"; 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
   echo I: checking out local git repository...
   dir="$(mktemp -d home.XXXXXXXX)"
   trap "rm -rf $dir" 0


@@ -89,10 +93,15 @@ if ssh $MY_GIT_SERVER "test -d $MY_ACCOUNT_GIT_REPO"; then
   mv "$dir"/co/.git .
   git checkout-index --quiet --index --all
   git reset HEAD
   mv "$dir"/co/.git .
   git checkout-index --quiet --index --all
   git reset HEAD

+  rm -r $dir
+  trap - 0

   echo
 else
   echo I: creating remote git repository for this account...
   echo
 else
   echo I: creating remote git repository for this account...

-  ssh $MY_GIT_SERVER "GIT_DIR=${MY_ACCOUNT_GIT_REPO} git --bare init"
+  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


@@ -104,10 +113,8 @@ else
   echo
 fi
 
   echo
 fi
 

-rm -f "$0"
-

 echo I: spawning a shell...
 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.