Merge #75: Use parent tor-browser-build instead of submodule if available
254be61
Use parent tor-browser-build instead of submodule if available (JeremyRand)
Pull request description:
TODO:
- [ ] Redirect error messages from rm/rmdir to `/dev/null`. (Split out into separate issue; not a blocker.)
pull/77/head
commit
fa99425822
@ -0,0 +1,22 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# This script inits tor-browser-build as a Git submodule of ncdns-repro, unless
|
||||||
|
# ncdns-repro is inside a tor-browser-build tree (e.g. as a Git submodule of
|
||||||
|
# tor-browser-build), in which case it uses the parent tor-browser-build.
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
shopt -s nullglob globstar
|
||||||
|
|
||||||
|
ncdnsdir=$(pwd)
|
||||||
|
parentdir=$(dirname "${ncdnsdir}")
|
||||||
|
parentbase=$(basename "${parentdir}")
|
||||||
|
|
||||||
|
if [ "${parentbase}" == "tor-browser-build" ]; then
|
||||||
|
if [ -e tor-browser-build ]; then
|
||||||
|
rm tor-browser-build || rmdir tor-browser-build || mv tor-browser-build tor-browser-build-backup
|
||||||
|
fi
|
||||||
|
ln -s -T .. tor-browser-build
|
||||||
|
else
|
||||||
|
git submodule update --init
|
||||||
|
make -C tor-browser-build submodule-update
|
||||||
|
fi
|
Loading…
Reference in New Issue