diff options
| author | teor <teor@torproject.org> | 2019-06-11 14:34:44 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-06-11 14:34:44 +1000 |
| commit | 396134188f21b3f8bdfe35171f14c6b70446ea3e (patch) | |
| tree | 0ca43422c03015a7ff91a641f34f121b748e5c45 /scripts/git/git-pull-all.sh | |
| parent | 973800b847844cfaacf48658d02fe3ada77cbcf6 (diff) | |
| download | tor-396134188f21b3f8bdfe35171f14c6b70446ea3e.tar.gz tor-396134188f21b3f8bdfe35171f14c6b70446ea3e.zip | |
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.
Diffstat (limited to 'scripts/git/git-pull-all.sh')
| -rwxr-xr-x | scripts/git/git-pull-all.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/git/git-pull-all.sh b/scripts/git/git-pull-all.sh index e5ba96a059..8eb42c7c18 100755 --- 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. # |