From 5187d5032cd793b8602f35c0f31e67656da8c692 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Fri, 24 Apr 2020 13:26:32 -0700 Subject: [PATCH] update-prod-static: Remove unused authors-not-required. This argument hasn't done anything since we moved constructing the /team page to a cron job. --- scripts/lib/install | 2 +- scripts/lib/upgrade-zulip-stage-2 | 2 +- tools/build-release-tarball | 9 +++------ tools/update-prod-static | 2 -- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/scripts/lib/install b/scripts/lib/install index e8240b43e9..2f73f9c9b8 100755 --- a/scripts/lib/install +++ b/scripts/lib/install @@ -403,7 +403,7 @@ if [ "$has_appserver" = 0 ]; then # If we're installing from a git checkout, we need to run # `tools/update-prod-static` in order to build the static # assets. - su zulip -c '/home/zulip/deployments/current/tools/update-prod-static --authors-not-required' + su zulip -c '/home/zulip/deployments/current/tools/update-prod-static' fi fi diff --git a/scripts/lib/upgrade-zulip-stage-2 b/scripts/lib/upgrade-zulip-stage-2 index 01559a7b26..a1c4430c6c 100755 --- a/scripts/lib/upgrade-zulip-stage-2 +++ b/scripts/lib/upgrade-zulip-stage-2 @@ -142,7 +142,7 @@ elif args.from_git: # update-prod-static with the git upgrade process. But it'll fail # safely; this seems like a worthwhile tradeoff to minimize downtime. logging.info("Building static assets...") - subprocess.check_call(["./tools/update-prod-static", "--authors-not-required", "--prev-deploy", + subprocess.check_call(["./tools/update-prod-static", "--prev-deploy", os.path.join(DEPLOYMENTS_DIR, 'current')], preexec_fn=su_to_zulip) logging.info("Caching zulip git version...") diff --git a/tools/build-release-tarball b/tools/build-release-tarball index 6b83e64cdc..d3906c6608 100755 --- a/tools/build-release-tarball +++ b/tools/build-release-tarball @@ -2,18 +2,15 @@ set -eu usage() { - echo "Usage: $0 [--authors-not-required]" >&2 + echo "Usage: $0 " >&2 exit 1 } -args="$(getopt -o '' -l 'authors-not-required,help' -n "$0" -- "$@")" +args="$(getopt -o '' -l 'help' -n "$0" -- "$@")" eval "set -- $args" -authors_not_required= while true; do case "$1" in - --authors-not-required) - authors_not_required=--authors-not-required; shift;; --) shift; break;; *) usage;; esac @@ -92,7 +89,7 @@ rabbitmq_password = 'not_used_here' initial_password_salt = 'not_used_here' EOF -./tools/update-prod-static $authors_not_required +./tools/update-prod-static # We don't need duplicate copies of emoji with hashed paths, and they would break bugdown find prod-static/serve/generated/emoji/images/emoji/ -regex '.*\.[0-9a-f]+\.png' -delete diff --git a/tools/update-prod-static b/tools/update-prod-static index 187a86899c..1acc64781c 100755 --- a/tools/update-prod-static +++ b/tools/update-prod-static @@ -25,8 +25,6 @@ sanity_check.check_venv(__file__) parser = argparse.ArgumentParser() parser.add_argument('--prev-deploy', metavar='DIR', help='a previous deploy from which to reuse files if possible') -parser.add_argument('--authors-not-required', action='store_true', default=False, - help='Authors files need not be updated') args = parser.parse_args() prev_deploy = args.prev_deploy