From 27d41604df0e7c38aa2ee31b97ef83dc5967172a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <saghul@jitsi.org>
Date: Wed, 16 Dec 2020 11:56:42 +0100
Subject: [PATCH] fix(script) add commits list to update LJM message

---
 resources/update-ljm.sh | 48 +++++++++++++++++++++++++++++++++++------
 1 file changed, 41 insertions(+), 7 deletions(-)

diff --git a/resources/update-ljm.sh b/resources/update-ljm.sh
index a316d69f7..6e771fe9f 100755
--- a/resources/update-ljm.sh
+++ b/resources/update-ljm.sh
@@ -2,15 +2,49 @@
 
 set -e -u
 
+if [[ ! -z $(git status -s --untracked-files=no) ]]; then
+    echo "Git tree is not clean, aborting!"
+    exit 1
+fi
+
+BRANCH=$(git rev-parse --abbrev-ref HEAD)
+if [[ "$BRANCH" != "master" ]]; then
+  echo "Not on master, aborting!";
+  exit 1;
+fi
+
 THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
-LATEST_LJM_COMMIT=$(git ls-remote https://github.com/jitsi/lib-jitsi-meet.git HEAD | awk '{ print $1 }')
+PID=$$
+LJM_TMP="${TMPDIR:-/tmp}/ljm-${PID}"
 
 pushd ${THIS_DIR}/..
-
-npm install github:jitsi/lib-jitsi-meet#${LATEST_LJM_COMMIT}
-git add package.json package-lock.json
-git commit -m "chore(deps) lib-jitsi-meet@latest"
-
+CURRENT_LJM_COMMIT=$(jq -r '.dependencies."lib-jitsi-meet"' package.json | cut -d "#" -f2)
 popd
 
-echo "Done! Now push your branch to GH and open a PR!"
+git clone --branch master --single-branch --bare https://github.com/jitsi/lib-jitsi-meet ${LJM_TMP}
+
+pushd ${LJM_TMP}
+LATEST_LJM_COMMIT=$(git rev-parse HEAD)
+LJM_COMMITS=$(git log --oneline --no-decorate --no-merges ${CURRENT_LJM_COMMIT}..HEAD --pretty=format:"%x2a%x20%s")
+popd
+
+if [[ "${CURRENT_LJM_COMMIT}" == "${LATEST_LJM_COMMIT}" ]]; then
+    echo "No need to update, already on the latest commit!"
+    rm -rf ${LJM_TMP}
+    exit 1
+fi
+
+GH_LINK="https://github.com/jitsi/lib-jitsi-meet/compare/${CURRENT_LJM_COMMIT}...${LATEST_LJM_COMMIT}"
+
+pushd ${THIS_DIR}/..
+EPOCH=$(date +%s)
+NEW_BRANCH="update-ljm-${EPOCH}"
+git checkout -b ${NEW_BRANCH}
+npm install github:jitsi/lib-jitsi-meet#${LATEST_LJM_COMMIT}
+git add package.json package-lock.json
+git commit -m "chore(deps) lib-jitsi-meet@latest" -m "${LJM_COMMITS}" -m "${GH_LINK}"
+git push origin ${NEW_BRANCH}
+gh pr create --repo jitsi/jitsi-meet --fill
+popd
+
+rm -rf ${LJM_TMP}