replace `pwd` calls with $PWD

also ensure that $PWD is defined by adding it to lib

diff --git a/lib/git-fake-bare b/lib/git-fake-bare
index ab9fb12765c7e06c7d4a0f9cfa222cd7bfd1fb46..545115bac6581d91d8865c98f4eadaf7d13471b9 100644 (file)
--- a/lib/git-fake-bare
+++ b/lib/git-fake-bare
@@ -66,7 +66,7 @@ git_fake_bare_register =
                error "git worktree $worktree does not exist"
        fi
        echo "Registering git url: $url in $MR_CONFIG (with worktree $worktree)"
-       mr -c "$MR_CONFIG" config "`pwd`" \
+       mr -c "$MR_CONFIG" config "$PWD" \
                checkout="git_fake_bare_checkout '$url' '$MR_REPO' '$worktree'"
 
 # vim:sw=8:sts=0:ts=8:noet

diff --git a/mr b/mr
index 494e89bd4bb05a4ca5bcdded5fc81c94ef6ae6e8..a611e3873a9644816adeff73021278dcc5825b84 100755 (executable)
--- a/mr
+++ b/mr
@@ -1038,6 +1038,7 @@ ls = list
 [DEFAULT]
 order = 10
 lib =
+       PWD="$(pwd)"
        error() {
                echo "mr: $@" >&2
                exit 1
@@ -1123,21 +1124,21 @@ svn_register =
                error "cannot determine svn url"
        fi
        echo "Registering svn url: $url in $MR_CONFIG"
-       mr -c "$MR_CONFIG" config "`pwd`" checkout="svn co '$url' '$MR_REPO'"
+       mr -c "$MR_CONFIG" config "$PWD" checkout="svn co '$url' '$MR_REPO'"
 git_register = 
        url="$(LANG=C git-config --get remote.origin.url)" || true
        if [ -z "$url" ]; then
                error "cannot determine git url"
        fi
        echo "Registering git url: $url in $MR_CONFIG"
-       mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone '$url' '$MR_REPO'"
+       mr -c "$MR_CONFIG" config "$PWD" checkout="git clone '$url' '$MR_REPO'"
 bzr_register =
        url=$(cat .bzr/branch/parent)
        if [ -z "$url" ]; then
                error "cannot determine bzr url"
        fi
        echo "Registering bzr url: $url in $MR_CONFIG"
-       mr -c "$MR_CONFIG" config "`pwd`" checkout="bzr clone '$url' '$MR_REPO'"
+       mr -c "$MR_CONFIG" config "$PWD" checkout="bzr clone '$url' '$MR_REPO'"
 cvs_register =
        repo=$(cat CVS/Repository)
        root=$(cat CVS/Root)
@@ -1145,22 +1146,22 @@ cvs_register =
                error "cannot determine cvs root"
                fi
        echo "Registering cvs repository $repo at root $root"
-       mr -c "$MR_CONFIG" config "`pwd`" checkout="cvs -d '$root' co -d '$MR_REPO' '$repo'"
+       mr -c "$MR_CONFIG" config "$PWD" checkout="cvs -d '$root' co -d '$MR_REPO' '$repo'"
 hg_register = 
        url=$(hg showconfig paths.default)
        echo "Registering mercurial repo url: $url in $MR_CONFIG"
-       mr -c "$MR_CONFIG" config "`pwd`" checkout="hg clone '$url' '$MR_REPO'"
+       mr -c "$MR_CONFIG" config "$PWD" checkout="hg clone '$url' '$MR_REPO'"
 darcs_register = 
        url=$(cat _darcs/prefs/defaultrepo)
        echo "Registering darcs repository $url in $MR_CONFIG"
-       mr -c "$MR_CONFIG" config "`pwd`" checkout="darcs get '$url'p '$MR_REPO'"
+       mr -c "$MR_CONFIG" config "$PWD" checkout="darcs get '$url'p '$MR_REPO'"
 git_bare_register = 
        url="$(LANG=C GIT_CONFIG=config git-config --get remote.origin.url)" || true
        if [ -z "$url" ]; then
                error "cannot determine git url"
        fi
        echo "Registering git url: $url in $MR_CONFIG"
-       mr -c "$MR_CONFIG" config "`pwd`" checkout="git clone --bare '$url' '$MR_REPO'"
+       mr -c "$MR_CONFIG" config "$PWD" checkout="git clone --bare '$url' '$MR_REPO'"
 
 help =
        if [ ! -e "$MR_PATH" ]; then