Stop hard-coding env vars in the git scripts

Set the env vars:
* TOR_MASTER_NAME to override the tor master branch name, and
* TOR_WKT_NAME to override the worktree path

Fixes bug 30841; bugfix on 0.4.0.1-alpha.

diff --git a/changes/bug30841 b/changes/bug30841
new file mode 100644 (file)
index 0000000..c6d1c51
--- /dev/null
+++ b/changes/bug30841
@@ -0,0 +1,3 @@
+  o Minor bugfixes (git scripts):
+    - Stop hard-coding the tor master branch name and worktree path in the
+      git scripts. Fixes bug 30841; bugfix on 0.4.0.1-alpha.

diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh
index c9ec55ac6f4718ea184816048463f62aab6643fd..ba29983284d7b8399880ebeb0777754d6ab86767 100755 (executable)
--- a/scripts/git/git-merge-forward.sh
+++ b/scripts/git/git-merge-forward.sh
@@ -17,9 +17,9 @@
 GIT_PATH=${TOR_FULL_GIT_PATH:-"FULL_PATH_TO_GIT_REPOSITORY_DIRECTORY"}
 # The tor master git repository directory from which all the worktree have
 # been created.
-TOR_MASTER_NAME="tor"
+TOR_MASTER_NAME=${TOR_MASTER_NAME:-"tor"}
 # The worktrees location (directory).
-TOR_WKT_NAME="tor-wkt"
+TOR_WKT_NAME=${TOR_WKT_NAME:-"tor-wkt"}
 
 #########################
 # End of configuration. #

diff --git a/scripts/git/git-pull-all.sh b/scripts/git/git-pull-all.sh
index e5ba96a0598193166bdaefeb2ccd2b92dffdba72..8eb42c7c1839caae4b09a4df1553042b879b076e 100755 (executable)
--- a/scripts/git/git-pull-all.sh
+++ b/scripts/git/git-pull-all.sh
@@ -17,9 +17,9 @@
 GIT_PATH=${TOR_FULL_GIT_PATH:-"FULL_PATH_TO_GIT_REPOSITORY_DIRECTORY"}
 # The tor master git repository directory from which all the worktree have
 # been created.
-TOR_MASTER_NAME="tor"
+TOR_MASTER_NAME=${TOR_MASTER_NAME:-"tor"}
 # The worktrees location (directory).
-TOR_WKT_NAME="tor-wkt"
+TOR_WKT_NAME=${TOR_WKT_NAME:-"tor-wkt"}
 
 #########################
 # End of configuration. #