From 225e4b6eb8aa3e2b2c911f17f5e4de39cbf4ff56 Mon Sep 17 00:00:00 2001
From: Chris Busillo <info@shinycomputers.com>
Date: Wed, 12 Jun 2024 20:29:23 -0400
Subject: [PATCH] Bump version after merge into release

---
 push-prerelease-to-release.sh | 10 ----------
 push.sh                       | 22 ++++++++++++++++++++++
 pyproject.toml                |  4 ++--
 3 files changed, 24 insertions(+), 12 deletions(-)
 delete mode 100755 push-prerelease-to-release.sh
 create mode 100755 push.sh

diff --git a/push-prerelease-to-release.sh b/push-prerelease-to-release.sh
deleted file mode 100755
index 2b5e1e2..0000000
--- a/push-prerelease-to-release.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#~/bin/bash
-git checkout prerelease
-git pull origin prerelease
-git checkout release
-git merge prerelease -m "merge prerelease into release"
-git push
-git checkout prerelease
-git pull origin prerelease
-git merge release -m "merge release into prerelease"
-git push
diff --git a/push.sh b/push.sh
new file mode 100755
index 0000000..974298b
--- /dev/null
+++ b/push.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+if [ "$1" == "release" ]; then
+  SOURCE_BRANCH="prerelease"
+  DESTINATION_BRANCH="release"
+elif [ "$1" == "prerelease" ]; then
+  SOURCE_BRANCH="master"
+  DESTINATION_BRANCH="prerelease"
+else
+  echo "Please provide the destination branch name as an argument."
+  exit 1
+fi
+
+git checkout "$SOURCE_BRANCH"
+git pull origin "$SOURCE_BRANCH"
+git checkout "$DESTINATION_BRANCH"
+git merge "$SOURCE_BRANCH" -m "merge "$SOURCE_BRANCH" into "$DESTINATION_BRANCH""
+git push
+git checkout "$SOURCE_BRANCH"
+git pull origin "$SOURCE_BRANCH"
+git merge "$DESTINATION_BRANCH" -m "merge $DESTINATION_BRANCH into $SOURCE_BRANCH"
+git push
diff --git a/pyproject.toml b/pyproject.toml
index 8c34ab0..170946e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "bd_to_avp"
-version = "0.2.65"
+version = "0.2.66"
 description = "Script to convert 3D Blu-ray Discs (and mts) to Apple Vision Pro (MV-HEVC) files"
 authors = ["Chris Busillo <info@shinycomputers.com>"]
 readme = "README.md"
@@ -40,7 +40,7 @@ build-backend = "poetry.core.masonry.api"
 project_name = "3D Blu-ray to Vision pro"
 bundle = "com.shinycomputers"
 architectures = ["arm64"]
-version = "0.2.65"
+version = "0.2.66"
 icon = "bd_to_avp/resources/app_icon"
 organization = "Shiny Computers"