Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

provision: Fix hardcoding of current user. 

This fixes a regression in 8e82257444
and 2b8324b778.
This commit is contained in:
Tim Abbott 2016-10-25 21:55:39 -07:00
parent 1a927a424f
commit 129f1472fb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/provision.py
View File

@ -123,6 +123,7 @@ REPO_STOPWORDS_PATH = os.path.join(
LOUD = dict(_out=sys.stdout, _err=sys.stderr) LOUD = dict(_out=sys.stdout, _err=sys.stderr)
user_id = os.getuid()
def main(options): def main(options):
# type: (Any) -> int # type: (Any) -> int
@ -176,7 +177,7 @@ def main(options):
run(["tools/setup/download-zxcvbn"]) run(["tools/setup/download-zxcvbn"])
if os.path.isdir(EMOJI_CACHE_PATH): if os.path.isdir(EMOJI_CACHE_PATH):
run(["sudo", "chown", "zulip:zulip", EMOJI_CACHE_PATH]) run(["sudo", "chown", "%s:%s" % (user_id, user_id), EMOJI_CACHE_PATH])
run(["python", "tools/setup/emoji_dump/build_emoji"]) run(["python", "tools/setup/emoji_dump/build_emoji"])
run(["scripts/setup/generate_secrets.py", "--development"]) run(["scripts/setup/generate_secrets.py", "--development"])
if options.is_travis and not options.is_production_travis: if options.is_travis and not options.is_production_travis:
@ -217,7 +218,7 @@ def main(options):
if os.path.islink("node_modules"): if os.path.islink("node_modules"):
run(["sudo", "rm", "-f", "node_modules"]) run(["sudo", "rm", "-f", "node_modules"])
if os.path.isdir(NPM_CACHE_PATH): if os.path.isdir(NPM_CACHE_PATH):
run(["sudo", "chown", "zulip:zulip", NPM_CACHE_PATH]) run(["sudo", "chown", "%s:%s" % (user_id, user_id), NPM_CACHE_PATH])
setup_node_modules() setup_node_modules()
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
print(WARNING + "`npm install` failed; retrying..." + ENDC) print(WARNING + "`npm install` failed; retrying..." + ENDC)