From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-3.4 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, NUMERIC_HTTP_ADDR shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 200B91F4C1 for ; Wed, 16 Oct 2019 08:59:56 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/2] examples/grok-pull.post_update_hook: use "inbox_dir" Date: Wed, 16 Oct 2019 08:59:54 +0000 Message-Id: <20191016085955.23674-2-e@80x24.org> In-Reply-To: <20191016085955.23674-1-e@80x24.org> References: <20191016085955.23674-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Move away from using "mainrepo" since it's confusing to new users, especially with v2. --- examples/grok-pull.post_update_hook.sh | 28 +++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/examples/grok-pull.post_update_hook.sh b/examples/grok-pull.post_update_hook.sh index 66c5cea5..ab4e54e7 100755 --- a/examples/grok-pull.post_update_hook.sh +++ b/examples/grok-pull.post_update_hook.sh @@ -15,19 +15,19 @@ if git --git-dir="$full_git_dir" ls-tree --name-only HEAD | \ grep -E '^(m|d)$' >/dev/null then inbox_fmt=2 - inbox_mainrepo=$(expr "$full_git_dir" : "$EPOCH2MAIN") - inbox_name=$(basename "$inbox_mainrepo") - msgmap="$inbox_mainrepo"/msgmap.sqlite3 + inbox_dir=$(expr "$full_git_dir" : "$EPOCH2MAIN") + inbox_name=$(basename "$inbox_dir") + msgmap="$inbox_dir"/msgmap.sqlite3 else inbox_fmt=1 - inbox_mainrepo="$full_git_dir" - inbox_name=$(basename "$inbox_mainrepo" .git) - msgmap="$inbox_mainrepo"/public-inbox/msgmap.sqlite3 + inbox_dir="$full_git_dir" + inbox_name=$(basename "$inbox_dir" .git) + msgmap="$inbox_dir"/public-inbox/msgmap.sqlite3 fi # run public-inbox-init iff unconfigured -cfg_mainrepo=$(git config -f "$PI_CONFIG" publicinbox."$inbox_name".mainrepo) -case $cfg_mainrepo in +cfg_dir=$(git config -f "$PI_CONFIG" publicinbox."$inbox_name".dir) +case $cfg_dir in '') remote_git_url=$(git --git-dir="$full_git_dir" config remote.origin.url) case $remote_git_url in @@ -47,7 +47,7 @@ case $cfg_mainrepo in esac config_url="$remote_inbox_url"/_/text/config/raw - remote_config="$inbox_mainrepo"/remote.config.$$ + remote_config="$inbox_dir"/remote.config.$$ trap 'rm -f "$remote_config"' EXIT if curl --compressed -sSf -v "$config_url" >"$remote_config" then @@ -68,15 +68,15 @@ case $cfg_mainrepo in newsgroups= addresses="$inbox_name@$$.$(hostname).example.com" echo >&2 "E: curl $config_url failed" - echo >&2 "E: using bogus <$addresses> for $inbox_mainrepo" + echo >&2 "E: using bogus <$addresses> for $inbox_dir" fi local_url="http://127.0.0.1:8080/$inbox_name" public-inbox-init -V$inbox_fmt "$inbox_name" \ - "$inbox_mainrepo" "$local_url" $addresses + "$inbox_dir" "$local_url" $addresses if test $? -ne 0 then - echo >&2 "E: public-inbox-init failed on $inbox_mainrepo" + echo >&2 "E: public-inbox-init failed on $inbox_dir" exit 1 fi @@ -87,7 +87,7 @@ case $cfg_mainrepo in # only one newsgroup per inbox break done - echo "I: $inbox_name at $inbox_mainrepo ($addresses) $local_url" + echo "I: $inbox_name at $inbox_dir ($addresses) $local_url" ;; esac @@ -102,7 +102,7 @@ then : v2 inboxes may be init-ed with an empty msgmap ;; *) - $EATMYDATA public-inbox-index -v "$inbox_mainrepo" + $EATMYDATA public-inbox-index -v "$inbox_dir" ;; esac fi