]> git.madduck.net Git - etc/mrsetup.git/blobdiff - mrsetup

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

do not use long opts to call shell
[etc/mrsetup.git] / mrsetup
diff --git a/mrsetup b/mrsetup
index 41173f9d6ebfd07f2cd306335c748ca1bd719a57..5a17d073f705277d4879037fd1c1c30bb661faba 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,7 +20,7 @@ MR_FGIT=.fgits/mr.git
 MR=.mr
 BIN_DIR=.bin
 
-if [ -z "$SSH_AUTH_SOCK" ]; then
+if [ -z "${SSH_AUTH_SOCK:-}" ]; then
   echo E: '$SSH_AUTH_SOCK' is not set. >&2
   exit 1
 fi
@@ -55,7 +56,7 @@ else
   echo I: cloning mr into ${MR_CODE}...
   mkdir --parent ${MR_CODE%/*}
   git clone $MR_REPO_URL $MR_CODE
-  mkdir .bin
+  mkdir --parent $BIN_DIR
   ln -s ../${MR_CODE}/mr $BIN_DIR/mr
   echo
 fi
@@ -81,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
@@ -89,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'
+    " </dev/null
   echo I: setting up local git repository...
   git init
   git remote add origin $MY_ACCOUNT_REPO_URL
@@ -101,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 -i -l </dev/tty >/dev/tty
+
+echo I: back from the shell.
 
 exit 0