X-Git-Url: https://git.madduck.net/etc/mrsetup.git/blobdiff_plain/37e10039f750d13cadd6235ed20564bb28adc039..8bea0f1aaf070543c4cc9172d35935c84c5cfa8b:/mrsetup?ds=sidebyside diff --git a/mrsetup b/mrsetup index a1ba709..148f609 100755 --- a/mrsetup +++ b/mrsetup @@ -7,15 +7,13 @@ # 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_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=ssh://git.madduck.net/~/git/pub/code/mr.git -MR_CODE=code/mr +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 BIN_DIR=.bin @@ -85,33 +83,33 @@ cp $MR/templ/.mrconfig . 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