improvements

[etc/mrsetup.git] / mrsetup

diff --git a/mrsetup b/mrsetup
index ca453ae67ee9aff5d0efa627b90c0601ec8e94c3..d1fbb1b6da756292581edfa50430b6ad3ae6822d 100755 (executable)
--- a/mrsetup
+++ b/mrsetup
@@ -9,7 +9,8 @@ set -eu
 
 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
@@ -19,24 +20,29 @@ 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
-  exit 1
+  exit 2
 fi
 
 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
-  exit 3
+  exit 4
 fi
 
 if [ -d ".git" ]; then
   echo E: .git already exists. >&2
-  exit 3
+  exit 5
 fi
 
 if [ -d code/mr ]; then
@@ -44,7 +50,7 @@ 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
-    exit 4
+    exit 6
   fi
 else
   echo I: cloning mr into ${MR_CODE}...
@@ -76,7 +82,7 @@ cp $MR/templ/.mrconfig .
 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
@@ -84,10 +90,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
+  rm -r $dir
+  trap - 0
   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'
+    "
   echo I: setting up local git repository...
   git init
   git remote add origin $MY_ACCOUNT_REPO_URL
@@ -96,8 +107,12 @@ else
   git add .mrconfig
   git commit -m'initial checkin'
   git push --all
+  echo
 fi
 
-[ -f "$0" ] && rm $0
+echo I: spawning a shell...
+$SHELL --interactive --login
+
+echo I: back from the shell.
 
 exit 0