From 840a98ff401d86ef5fb487a37d25d3bc57551ea9 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 22 May 2023 04:10:21 -0400
Subject: [PATCH] Update app build scripts for branch reshuffling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`master` → `6.0`, `fx102` → `main`
---
 app/scripts/5.0_beta_build_and_deploy         | 26 ------------------
 app/scripts/5.0_dev_build_and_deploy          | 27 -------------------
 ...nd_deploy => 6.0_release_build_and_deploy} |  2 +-
 app/scripts/7.0_beta_build_and_deploy         |  2 +-
 app/scripts/7.0_dev_build_and_deploy          |  2 +-
 app/scripts/7.0_test_build_and_deploy         |  2 +-
 6 files changed, 4 insertions(+), 57 deletions(-)
 delete mode 100755 app/scripts/5.0_beta_build_and_deploy
 delete mode 100755 app/scripts/5.0_dev_build_and_deploy
 rename app/scripts/{5.0_release_build_and_deploy => 6.0_release_build_and_deploy} (97%)

diff --git a/app/scripts/5.0_beta_build_and_deploy b/app/scripts/5.0_beta_build_and_deploy
deleted file mode 100755
index d129a61b4d..0000000000
--- a/app/scripts/5.0_beta_build_and_deploy
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-APP_ROOT_DIR="$(dirname "$SCRIPT_DIR")"
-ROOT_DIR="$(dirname "$(dirname "$SCRIPT_DIR")")"
-. "$APP_ROOT_DIR/config.sh"
-
-CHANNEL="beta"
-export SAFARI_APPEX="$ROOT_DIR/../safari-app-extension-builds/beta/ZoteroSafariExtension.appex"
-
-cd "$SCRIPT_DIR"
-./check_requirements
-
-hash=`./get_repo_branch_hash master`
-source_dir=`./get_commit_files $hash`
-build_dir=`mktemp -d`
-
-function cleanup {
-	rm -rf "$source_dir"
-	rm -rf "$build_dir"
-}
-trap cleanup EXIT
-
-./prepare_build -s "$source_dir" -o "$build_dir" -c $CHANNEL -m $hash
-./build_and_deploy -d "$build_dir" -p $BUILD_PLATFORMS -c $CHANNEL
diff --git a/app/scripts/5.0_dev_build_and_deploy b/app/scripts/5.0_dev_build_and_deploy
deleted file mode 100755
index d2f46d811c..0000000000
--- a/app/scripts/5.0_dev_build_and_deploy
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-APP_ROOT_DIR="$(dirname "$SCRIPT_DIR")"
-ROOT_DIR="$(dirname "$(dirname "$SCRIPT_DIR")")"
-. "$APP_ROOT_DIR/config.sh"
-
-CHANNEL="dev"
-BRANCH="master"
-export SAFARI_APPEX="$ROOT_DIR/../safari-app-extension-builds/dev/ZoteroSafariExtension.appex"
-
-cd "$SCRIPT_DIR"
-./check_requirements
-
-hash=`./get_repo_branch_hash $BRANCH`
-source_dir=`./get_commit_files $hash`
-build_dir=`mktemp -d`
-
-function cleanup {
-	rm -rf "$source_dir"
-	rm -rf "$build_dir"
-}
-trap cleanup EXIT
-
-./prepare_build -s "$source_dir" -o "$build_dir" -c $CHANNEL -m $hash
-./build_and_deploy -d "$build_dir" -p $BUILD_PLATFORMS -c $CHANNEL -i 1
diff --git a/app/scripts/5.0_release_build_and_deploy b/app/scripts/6.0_release_build_and_deploy
similarity index 97%
rename from app/scripts/5.0_release_build_and_deploy
rename to app/scripts/6.0_release_build_and_deploy
index 1f6b5d82e2..d3f647946f 100755
--- a/app/scripts/5.0_release_build_and_deploy
+++ b/app/scripts/6.0_release_build_and_deploy
@@ -7,7 +7,7 @@ ROOT_DIR="$(dirname "$(dirname "$SCRIPT_DIR")")"
 . "$APP_ROOT_DIR/config.sh"
 
 CHANNEL="release"
-BRANCH="master"
+BRANCH="6.0"
 
 cd "$SCRIPT_DIR"
 ./check_requirements
diff --git a/app/scripts/7.0_beta_build_and_deploy b/app/scripts/7.0_beta_build_and_deploy
index 1a9ee82eac..30a0e61a4d 100755
--- a/app/scripts/7.0_beta_build_and_deploy
+++ b/app/scripts/7.0_beta_build_and_deploy
@@ -7,7 +7,7 @@ ROOT_DIR="$(dirname "$(dirname "$SCRIPT_DIR")")"
 . "$APP_ROOT_DIR/config.sh"
 
 CHANNEL="beta"
-BRANCH="master"
+BRANCH="main"
 export SAFARI_APPEX="$ROOT_DIR/../safari-app-extension-builds/beta/ZoteroSafariExtension.appex"
 
 cd "$SCRIPT_DIR"
diff --git a/app/scripts/7.0_dev_build_and_deploy b/app/scripts/7.0_dev_build_and_deploy
index d2f46d811c..7e9cca3006 100755
--- a/app/scripts/7.0_dev_build_and_deploy
+++ b/app/scripts/7.0_dev_build_and_deploy
@@ -7,7 +7,7 @@ ROOT_DIR="$(dirname "$(dirname "$SCRIPT_DIR")")"
 . "$APP_ROOT_DIR/config.sh"
 
 CHANNEL="dev"
-BRANCH="master"
+BRANCH="main"
 export SAFARI_APPEX="$ROOT_DIR/../safari-app-extension-builds/dev/ZoteroSafariExtension.appex"
 
 cd "$SCRIPT_DIR"
diff --git a/app/scripts/7.0_test_build_and_deploy b/app/scripts/7.0_test_build_and_deploy
index 88fd6da467..94e08a1340 100755
--- a/app/scripts/7.0_test_build_and_deploy
+++ b/app/scripts/7.0_test_build_and_deploy
@@ -7,7 +7,7 @@ ROOT_DIR="$(dirname "$(dirname "$SCRIPT_DIR")")"
 . "$APP_ROOT_DIR/config.sh"
 
 CHANNEL="test"
-BRANCH="master"
+BRANCH="main"
 #export SAFARI_APPEX="$ROOT_DIR/../safari-app-extension-builds/dev/ZoteroSafariExtension.appex"
 
 cd "$SCRIPT_DIR"