From 4c07cbeb6159b36dfc0e019b48e77ede79dd6f49 Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm@torproject.org>
Date: Fri, 14 Jan 2022 12:25:06 +0100
Subject: [PATCH] Bug 40414: Add common config and functions files

Add common config file used to set Tor Browser version (and later other
things). We also add a `functions` file where we can put functions used
in multiple scripts.

The following lines can be used at the top of a script to use the config
and functions files:

  script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
  source "$script_dir/functions"
---
 tools/signing/functions              | 16 ++++++++++++++++
 tools/signing/set-config             |  1 +
 tools/signing/set-config.tbb-version |  7 +++++++
 3 files changed, 24 insertions(+)
 create mode 100644 tools/signing/functions
 create mode 100644 tools/signing/set-config
 create mode 100644 tools/signing/set-config.tbb-version

diff --git a/tools/signing/functions b/tools/signing/functions
new file mode 100644
index 000000000..f53f6edd0
--- /dev/null
+++ b/tools/signing/functions
@@ -0,0 +1,16 @@
+function exit_error {
+  for msg in "$@"
+  do
+    echo "$msg" > /dev/stderr
+  done
+  exit 1
+}
+
+function var_is_defined {
+  for var in "$@"
+  do
+    test -n "${!var}" || exit_error "$var is not defined (see set-config* files)"
+  done
+}
+
+. "$script_dir/set-config"
diff --git a/tools/signing/set-config b/tools/signing/set-config
new file mode 100644
index 000000000..70f120004
--- /dev/null
+++ b/tools/signing/set-config
@@ -0,0 +1 @@
+. "$script_dir/set-config.tbb-version"
diff --git a/tools/signing/set-config.tbb-version b/tools/signing/set-config.tbb-version
new file mode 100644
index 000000000..5e844b504
--- /dev/null
+++ b/tools/signing/set-config.tbb-version
@@ -0,0 +1,7 @@
+# The following 3 lines should be uncommented and updated:
+
+#tbb_version=11.5a4
+#tbb_version_build=1
+#tbb_version_type=alpha
+
+var_is_defined tbb_version tbb_version_build tbb_version_type
-- 
GitLab