]> 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:

disable account repos for now
[etc/mrsetup.git] / mrsetup
diff --git a/mrsetup b/mrsetup
index 651902b7ea67c7a62d6ac477d1466095ef46b6e7..148f609981640488870f951febb788e3da372c64 100755 (executable)
--- a/mrsetup
+++ b/mrsetup
@@ -7,14 +7,12 @@
 #
 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=$MY_GIT_URL_BASE/~/git/pub/code/mr.git
+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
 MR_CODE=$HOME/code/mr
 MR_FGIT=.fgits/mr.git
 MR=.mr
@@ -85,33 +83,33 @@ 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" </dev/null; then
-  echo I: checking out local git repository...
-  dir="$(mktemp -d home.XXXXXXXX)"
-  trap "rm -rf $dir" 0
-  git clone --no-checkout $MY_ACCOUNT_REPO_URL "$dir"/co
-  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
-    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
-  git config branch.master.remote origin
-  git config branch.master.merge refs/heads/master
-  git add .mrconfig
-  git commit -m'initial checkin'
-  git push --all
-  echo
-fi
+#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
+#  git clone --no-checkout $MY_ACCOUNT_REPO_URL "$dir"/co
+#  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
+#    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
+#  git config branch.master.remote origin
+#  git config branch.master.merge refs/heads/master
+#  git add .mrconfig
+#  git commit -m'initial checkin'
+#  git push --all
+#  echo
+#fi
 
 echo I: spawning a shell...
 $SHELL -i -l </dev/tty >/dev/tty
 
 echo I: spawning a shell...
 $SHELL -i -l </dev/tty >/dev/tty