make sure we are in ~

[etc/mrsetup.git] / mrsetup

diff --git a/mrsetup b/mrsetup
index 5af48336b22f769cd0c369dc398a83ddb0b14b3c..a1ba709d0ab32f9b4450f8315d8134b1616c7429 100755 (executable)
--- a/mrsetup
+++ b/mrsetup
@@ -9,34 +9,42 @@ 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=ssh://git.madduck.net/~/git/pub/code/mr.git

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

+if [ -z "${SSH_AUTH_SOCK:-}" ]; then
+  echo E: '$SSH_AUTH_SOCK' is not set. >&2
+  exit 1
+fi
+

 if [ ! -x "$(command -v git)" ]; then
   echo E: git is not installed. >&2
 if [ ! -x "$(command -v git)" ]; then
   echo E: git is not installed. >&2

-  exit 1
+  exit 2

 fi
 
 fi
 

+cd $HOME
+

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

-  exit 2
+  exit 3

 fi
 
 if [ -d "$MR_FGIT" ]; then
   echo E: "$MR_FGIT" already exists. >&2
 fi
 
 if [ -d "$MR_FGIT" ]; then
   echo E: "$MR_FGIT" already exists. >&2

-  exit 3
+  exit 4

 fi
 
 if [ -d ".git" ]; then
   echo E: .git already exists. >&2
 fi
 
 if [ -d ".git" ]; then
   echo E: .git already exists. >&2

-  exit 3
+  exit 5

 fi
 
 if [ -d code/mr ]; then
 fi
 
 if [ -d code/mr ]; then


@@ -44,13 +52,14 @@ if [ -d code/mr ]; then
     echo W: code/mr already exists, let us hope for the best... >&2
   else
     echo E: code/mr already exists. >&2
     echo W: code/mr already exists, let us hope for the best... >&2
   else
     echo E: code/mr already exists. >&2

-    exit 4
+    exit 6

   fi
 else
   echo I: cloning mr into ${MR_CODE}...
   mkdir --parent ${MR_CODE%/*}
   fi
 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


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


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


@@ -96,6 +110,12 @@ else
   git add .mrconfig
   git commit -m'initial checkin'
   git push --all
   git add .mrconfig
   git commit -m'initial checkin'
   git push --all

+  echo

 fi
 
 fi
 

+echo I: spawning a shell...
+$SHELL -i -l </dev/tty >/dev/tty
+
+echo I: back from the shell.
+

 exit 0
 exit 0