From patchwork Mon Apr 18 17:52:08 2016
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [1,of,6,STABLE] dockerdeb: elimate 'cd' in export command
From: Sean Farley <sean@farley.io>
X-Patchwork-Id: 14722
Message-Id: <db33d0e7476c79ac0bc8.1461001928@laptop.office.atlassian.com>
To: mercurial-devel@mercurial-scm.org
Date: Mon, 18 Apr 2016 10:52:08 -0700

# HG changeset patch
# User Sean Farley <sean@farley.io>
# Date 1460914600 25200
#      Sun Apr 17 10:36:40 2016 -0700
# Branch stable
# Node ID db33d0e7476c79ac0bc8048992ec6d24d6062c87
# Parent  97811ff7964710d32cae951df1da8019b46151a2
# EXP-Topic ppa
dockerdeb: elimate 'cd' in export command

This had the unfortunate side effect of causing the environment to have a
newline due to the fact that some 'cd' outputs the result of the directory
change.

diff --git a/contrib/dockerdeb b/contrib/dockerdeb
--- a/contrib/dockerdeb
+++ b/contrib/dockerdeb
@@ -2,11 +2,11 @@
 
 . $(dirname $0)/dockerlib.sh
 . $(dirname $0)/packagelib.sh
 
 BUILDDIR=$(dirname $0)
-export ROOTDIR=$(cd $BUILDDIR/..; pwd)
+export ROOTDIR=$(dirname $(readlink -f $BUILDDIR))
 
 checkdocker
 
 DISTID="$1"
 CODENAME="$2"