From ab2cfadcaa508372002e7c5b611bc0fe443c65e0 Mon Sep 17 00:00:00 2001 From: Carey Metcalfe Date: Sun, 21 May 2017 22:55:42 -0400 Subject: [PATCH] Fix emoji cache setup when not using provision.py. Moves creating the emoji folder from the provisioning script to the build_emoji script. Fixes the fact that the emoji cache directory wasn't being created when not using the provision.py script. --- tools/lib/provision.py | 4 ---- tools/setup/emoji/build_emoji | 7 ++++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/lib/provision.py b/tools/lib/provision.py index 40bab9fcf4..1419387e17 100755 --- a/tools/lib/provision.py +++ b/tools/lib/provision.py @@ -214,10 +214,6 @@ def main(options): # create linecoverage directory`var/node-coverage` run(["mkdir", "-p", NODE_TEST_COVERAGE_DIR_PATH]) - if not os.path.isdir(EMOJI_CACHE_PATH): - run(["sudo", "mkdir", EMOJI_CACHE_PATH]) - run(["sudo", "chown", "%s:%s" % (user_id, user_id), EMOJI_CACHE_PATH]) - run(["tools/setup/emoji/download-emoji-data"]) run(["tools/setup/emoji/build_emoji"]) run(["tools/setup/build_pygments_data.py"]) run(["scripts/setup/generate_secrets.py", "--development"]) diff --git a/tools/setup/emoji/build_emoji b/tools/setup/emoji/build_emoji index 4e7b72aa4b..9cf1672f78 100755 --- a/tools/setup/emoji/build_emoji +++ b/tools/setup/emoji/build_emoji @@ -82,7 +82,12 @@ EMOJI_POS_INFO_TEMPLATE = """\ } """ -# change directory +# Make and enter emoji directory +user_id = os.getuid() +if not os.path.isdir(EMOJI_CACHE_PATH): + run(["sudo", "mkdir", EMOJI_CACHE_PATH]) +run(["sudo", "chown", "%s:%s" % (user_id, user_id), EMOJI_CACHE_PATH]) +run(["tools/setup/emoji/download-emoji-data"]) os.chdir(EMOJI_SCRIPT_DIR_PATH) if 'TRAVIS' in os.environ: