Manage $MRCONFIG with `mr config'.

This allows to use an existing ~/.mrconfig, it works without an existing
~/.mrconfig and is idempotent.

diff --git a/movein b/movein
index 8cac926fb33d88a6dc462b6c26d911bd0a5c5114..ccdd709f49bce012f1217c0aacb8e8d70584d807 100755 (executable)
--- a/movein
+++ b/movein
@@ -40,7 +40,7 @@ SYNOPSIS
 
 COMMANDS
   init 
 
 COMMANDS
   init 

-      create ~/.mrconfig
+      create ~/.moveinrc, create/update  ~/.mrconfig

 
   ls
   list
 
   ls
   list


@@ -78,11 +78,6 @@ init() {
        usage
     fi
     
        usage
     fi
     

-    if [ -e $MRCONFIG ]; then
-       echo $MRCONFIG already exists
-       exit 1
-    fi
-    

     if [ -e $MOVEINRC ]; then
        echo $MOVEINRC already exists
        exit 1
     if [ -e $MOVEINRC ]; then
        echo $MOVEINRC already exists
        exit 1


@@ -123,11 +118,7 @@ EOF
        mkdir -p "$LOCAL_REPOS"
     fi
 
        mkdir -p "$LOCAL_REPOS"
     fi
 

-    cat <<END > $MRCONFIG
-[DEFAULT]
-include = cat /usr/share/mr/git-fake-bare
-END
-
+    mr -c "$MRCONFIG" config DEFAULT include="cat /usr/share/mr/git-fake-bare"

     
 }
 
     
 }
 


@@ -165,13 +156,9 @@ add() {
        git config core.bare false
        GIT_WORK_TREE="$PWD" git pull
        trap - 0
        git config core.bare false
        GIT_WORK_TREE="$PWD" git pull
        trap - 0

-       cat <<END >> $MRCONFIG

 
 

-[$LOCAL_REPO]
-checkout = git_fake_bare_checkout '$REPO_URL' '$REPO_NAME' '../../'
-END
+       mr -c "$MRCONFIG" config "$LOCAL_REPO" checkout="git_fake_bare_checkout '$REPO_URL' 'REPO_NAME' '../../'"

     fi
     fi

-

 }
 
 list() {
 }
 
 list() {


@@ -215,11 +202,8 @@ new() {
        git push --all
        
        trap - 0
        git push --all
        
        trap - 0

-       cat <<END >> $MRCONFIG

 
 

-[$LOCAL_REPO]
-checkout = git_fake_bare_checkout '$REPO_URL' '$REPO_NAME' '../../'
-END
+       mr -c "$MRCONFIG" config "$LOCAL_REPO" checkout="git_fake_bare_checkout '$REPO_URL' 'REPO_NAME' '../../'"

     fi
 
 }
     fi
 
 }