From 7715cda7cddd34b5d5ff033e3177b46e157099a2 Mon Sep 17 00:00:00 2001 From: Mike O'Connor Date: Sun, 30 Oct 2011 14:29:13 -0400 Subject: [PATCH] * add new CREATE_REMOTE option for github users * handle error from hostname -d gracefully --- movein | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/movein b/movein index 233f886..5da747e 100755 --- a/movein +++ b/movein @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Copyright © 2008 Mike O'Connor # @@ -80,11 +80,12 @@ EOF [ $# -ge 1 ] || usage -GIT_HOST=git.$(hostname -d) +GIT_HOST=git.$(hostname -d || echo "example.com") REMOTE_REPOS=~/git LOCAL_REPOS=~/.movein MRCONFIG=~/.mrconfig MOVEINRC=~/.moveinrc +CREATE_REMOTE=0 [ -e "$MOVEINRC" ] && . "$MOVEINRC" @@ -111,6 +112,25 @@ init() { REMOTE_REPOS=~/git fi + case $GIT_HOST in + *github*) + DEFAULT_CREATE_REMOTE=0 + CREATE_REMOTE_OPTIONS="[yN]" + ;; + *) + DEFAULT_CREATE_REMOTE=1 + CREATE_REMOTE_OPTIONS="[Yn]" + ;; + esac + + echo -n "should \"movein new\" run \"git init\" on the remote host? (github users should say \"no\") $CREATE_REMOTE_OPTIONS" + read CREATE_REMOTE_SELECTION + case "$CREATE_REMOTE_SELECTION" in + [yY]) CREATE_REMOTE=1 ;; + [nN]) CREATE_REMOTE=0 ;; + *) CREATE_REMOTE=$DEFAULT_CREATE_REMOTE + esac + echo -n "Local repository directory? [~/.movein] " read LOCAL_REPOS if [ -z "$LOCAL_REPOS" ]; then @@ -128,6 +148,7 @@ GIT_HOST=$GIT_HOST REMOTE_REPOS=$REMOTE_REPOS LOCAL_REPOS=$LOCAL_REPOS MRCONFIG=$MRCONFIG +CREATE_REMOTE=$CREATE_REMOTE EOF if [ ! -d "$LOCAL_REPOS" ]; then @@ -235,9 +256,11 @@ new() { trap "unset GIT_DIR; unset GIT_WORK_TREE; rm -rf $LOCAL_REPO" 0 mkdir -p "$LOCAL_REPO" - ssh $GIT_HOST " - GIT_DIR=$REMOTE_REPOS/$REPO_NAME git --bare init - "