Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add update command #19

Merged
merged 3 commits into from
May 16, 2019
Merged

feat: add update command #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2bd014
chore: update .gitmodule configuration
May 14, 2019
52106db
feat: add update command
May 14, 2019
58a928c
chore: Capture signals
May 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "ckeditor-dev"]
ignore = dirty
ignore = all
path = ckeditor-dev
url = https://github.com/ckeditor/ckeditor-dev.git
157 changes: 107 additions & 50 deletions ck.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@ function init() {
}

function usage() {
echo "Usage: ck.sh COMMAND"
echo
echo "Usage: ck.sh COMMAND [OPTIONS]"
echo
echo " Where COMMAND is either:"
echo
echo " 🔧 setup: Setup everything to start working on a patch"
echo " 💉 patch: Generate patches "
echo " 🔥 build: Generate a patched version of CKEditor"
echo " 🌶 update \$VERSION: Update the ckeditor-dev submodule to \$VERSION"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💥

echo
echo
}
Expand All @@ -32,18 +34,18 @@ if [ $# -ne 1 ]; then
exit 1
fi

trap "echo \"\n\nAborting.\n\"; exit" SIGHUP SIGINT SIGTERM

COMMAND=$1

case "$COMMAND" in
build)
echo
echo "*---------------------------------------------------------*"
echo "| ⚠️ WARNING |"
echo "*---------------------------------------------------------*"
echo "⚠️ WARNING"
echo

echo "This will generate a patched version of CKEditor"
read -p "Are you sure you want to continue? [y/n]" yn
read -p "Are you sure you want to continue?[y/n] " yn

case $yn in
[Yy]*)
Expand All @@ -56,7 +58,7 @@ case "$COMMAND" in
echo "Checking for existing patches"
echo

if ! ls ../patches/*; then
if ! ls ../patches/*.patch; then
echo "There doesn't seem to be any patch"
fi

Expand All @@ -66,15 +68,15 @@ case "$COMMAND" in

if ! git am ../patches/*; then
echo
echo "⚠️ There was a problem applying patches:"
echo "❌ There was a problem applying patches:"
echo
echo "To retry manually and fix:"
echo
echo " cd ckeditor-dev"
echo " git am --abort"
echo " git am ../patches/*"
echo
echo "Once you are happy with the result, run `sh ck.sh patch` to update the contents of \"patches/\"."
echo "Once you are happy with the result, run 'sh ck.sh patch' to update the contents of \"patches/\"."
echo
exit 1
fi
Expand All @@ -93,9 +95,7 @@ case "$COMMAND" in
cp -r dev/builder/release/ckeditor/* ../ckeditor/

echo
echo "*---------------------------------------------------------*"
echo "| ✅ DONE |"
echo "*---------------------------------------------------------*"
echo "✅ DONE"
echo
echo "Don't forget to commit the result!"
echo
Expand All @@ -119,37 +119,33 @@ case "$COMMAND" in
# Check for the existence of the liferay branch in the submodule
if ! git rev-parse --verify liferay &>/dev/null; then
echo
echo "*---------------------------------------------------------*"
echo "| ❌ ERROR |"
echo "*---------------------------------------------------------*"
echo "❌ ERROR"
echo
echo "It seems that there's no `liferay` branch in the `ckeditor-dev` submodule."
echo "It seems that there's no 'liferay' branch in the 'ckeditor-dev' submodule."
echo
echo "Please run `sh ck.sh setup` to set up everything correctly."
echo "Please run 'sh ck.sh setup' to set up everything correctly."
echo

exit 1
fi

git checkout liferay --quiet

# Check for existing patches
patches=$(find ../patches -name *.patch -type f)

if [[ $(echo "$patches" | wc -l) -ne 0 ]]; then
if ! ls ../patches/*.patch &>/dev/null ; then
echo
echo "*---------------------------------------------------------*"
echo "| ⚠️ WARNING |"
echo "*---------------------------------------------------------*"
echo "No patches found."
echo
else
echo
echo "⚠️ WARNING"
echo
echo "This will replace any existing patches..."
echo
echo "$patches"
ls -l ../patches/*.patch
echo

# Prompt the user to confirm he wants to delete existing patches
read -p "Are you sure you want to continue [y/n]? " yn
read -p "Are you sure you want to continue?[y/n] " yn
case $yn in
[Yy]*)
echo
Expand All @@ -163,13 +159,8 @@ case "$COMMAND" in
echo
echo "Aborting."
echo
exit 1
;;
esac
else
echo
echo "No patches found."
echo
fi

echo "Generating patches."
Expand All @@ -178,41 +169,107 @@ case "$COMMAND" in
git format-patch $sha1 -o ../patches

echo
echo "*---------------------------------------------------------*"
echo "| ✅ DONE |"
echo "*---------------------------------------------------------*"
echo
echo "✅ DONE"
echo
echo "You can now build CKEditor with your patches."
echo
echo
echo "Here are the steps to follow:"
echo
echo "1. Run `sh ./ck.sh build` to generate a patched version."
echo "1. Run 'sh ck.sh build' to generate a patched version."
echo
;;
setup)
init
git checkout --detach HEAD
git branch -f liferay HEAD
git checkout liferay

echo
echo "*---------------------------------------------------------*"
echo "| ✅ DONE |"
echo "*---------------------------------------------------------*"
echo "⚠️ WARNING"
echo
echo "❗ This will reset any changes you currently have in the 'ckeditor-dev' submodule"
echo
echo
echo "You can now start working on your patch(es)."
read -p "Are you sure you want to continue?[y/n] " yn
case $yn in
[Yy]*)
init
git checkout --detach HEAD --quiet
git branch -f liferay HEAD
git checkout liferay --quiet

echo
echo "✅ DONE"
echo
echo
echo "You can now start working on your patch(es)."
echo
echo
echo "Here are the steps to follow:"
echo
echo "1. Navigate to the ckeditor-dev submodule directory ('cd ckeditor-dev')"
echo "2. Work on your changes"
echo "3. Commit your changes"
echo "4. Run 'sh ck.sh patch' to generate the patches"
echo
;;
*)
echo
echo "Aborting."
echo
;;
esac
;;
update)
git submodule update --init
cd ckeditor-dev
git fetch

echo
echo "Listing current tags: "

tags=$(git tag -l --sort=creatordate | grep -v ee- | grep -v liferay | \
sort -t. -k 1,1nr -k 2,2nr -k 3,3nr -k 4,4nr | head -6)

echo "$tags"
echo

read -p "Please enter the tag you want to update to: " tag

if ! git describe --exact-match --tags $tag &>/dev/null ; then
echo
echo "❌ ERROR"
echo
echo "Sorry, the \`$tag\` tag does not exist."
echo
exit 1
fi


echo
echo "Here are the steps to follow:"
echo "⚠️ WARNING"
echo
echo "1. Navigate to the ckeditor-dev submodule directory (`cd ckeditor-dev`)"
echo "2. Work on your changes"
echo "3. Commit your changes"
echo "4. Run `sh ck.sh patch` to generate the patches"
echo "This will update the \`ckeditor-dev\` submodule to point to the $tag tag"
echo

read -p "Are you sure you want to continue?[y/n] " yn
case $yn in
[Yy]*)
git reset --hard HEAD
git clean -fdx
git checkout "$tag"

commitmsg=$(git log --oneline | head -1)

cd ..
git add ckeditor-dev
git commit -m "Update ckeditor-dev to $commitmsg"

echo
echo "✅ DONE"
echo
;;
*)
echo
echo "Aborting."
echo
;;
esac
;;
*)
usage
Expand Down