X-Git-Url: https://git.madduck.net/etc/mrsetup.git/blobdiff_plain/43da9a59389e903370ef00a057f9233b8d6b610f..2d015786d1cbef18d690125a57a7d2c1e564db3f:/mrsetup diff --git a/mrsetup b/mrsetup index f30b8cf..5a17d07 100755 --- 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 @@ -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/tty echo I: back from the shell.