From 9dc187cc25ee8c4d64b92bd0d1ce1ffde34164fc Mon Sep 17 00:00:00 2001
From: Michel Weststrate <mweststrate@fb.com>
Date: Tue, 10 Mar 2020 07:05:30 -0700
Subject: [PATCH] Make sure prepare-release scripts works when running from
 another dir

Summary: Yesterday's script failed if prepare-release was invoked from another dir

Reviewed By: jknoxville

Differential Revision: D20362093

fbshipit-source-id: a0ce877a2f145f320cf346dc86e3d2568279b8b9
---
 scripts/generate-changelog.js | 2 +-
 scripts/prepare-release.sh    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/generate-changelog.js b/scripts/generate-changelog.js
index 01dc8374a..f20543011 100755
--- a/scripts/generate-changelog.js
+++ b/scripts/generate-changelog.js
@@ -39,7 +39,7 @@ console.log(
 
 // # get all commit summaries since last release | find all changelog entries, but make sure there is only one line per commit by temporarily replacing newlines
 const hgLogCommand = `hg log -r "${firstCommit}::${lastCommit} and file('../*')" --template "{phabdiff} - {sub('\n','${newlineMarker}', desc)}\n"`;
-const hgLog = cp.execSync(hgLogCommand).toString();
+const hgLog = cp.execSync(hgLogCommand, {cwd: __dirname}).toString();
 
 const diffRe = /^D\d+/;
 const changeLogLineRe = /(^changelog:\s*?)(.*?)$/i;
diff --git a/scripts/prepare-release.sh b/scripts/prepare-release.sh
index fef4f8956..0c3cc253b 100755
--- a/scripts/prepare-release.sh
+++ b/scripts/prepare-release.sh
@@ -98,7 +98,7 @@ echo "Bumping version number for android related files..."
 "$SONAR_DIR"/scripts/bump.sh "$VERSION"
 
 # Generate changelog
-./generate-changelog.js
+"$SONAR_DIR"/scripts/generate-changelog.js
 
 # Create commit
 echo "Committing the files..."