From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id cKhgJ8B9u2GmEgAAgWs5BA (envelope-from ) for ; Thu, 16 Dec 2021 18:56:16 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id QLD7IsB9u2E9IAAAbx9fmQ (envelope-from ) for ; Thu, 16 Dec 2021 17:56:16 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 65A6CF6C8 for ; Thu, 16 Dec 2021 18:56:16 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id C798B297CD; Thu, 16 Dec 2021 12:56:11 -0500 (EST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60111.outbound.protection.outlook.com [40.107.6.111]) by mail.notmuchmail.org (Postfix) with ESMTPS id 5F583297C1 for ; Thu, 16 Dec 2021 12:42:10 -0500 (EST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f7bExeuSzVKHewYKLPLM+estKD99sVlw1IygAog6F1SS9JcE1rgti9l3f+/x8xrQxVkDqaJ84i5fSMC7clf1TNET3awLrlb7W6n1YdI5pUg/d1uN3LgoZGEYl0a9fbuOlEiVxdtzKjQVLkWKx7g+3Fo/Q1Sfgv0nOYJMkXO1PU0uCnHUnzy7a4g80r64NjlXY++pSSW9wTTTgBuJN8iEihT3dtsyg82fqb4R02JE9zpTdHG2laF2Aj4SXLQrIx1oxM6Pfus0PNixfitByaJnRU6NUJCuclX4sZYhylweo7bQMgkiawG/tPFtDbNtVO+PA5Y9yqT7wbHdqyviYAwqpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=JKVox1HLLFf8/zBKWsG3VbOj5bA21L6ld1G4ZzXGRqQ=; b=bWurKpBP6Byp+AtkvvQchTz7zM2i5OKoVrYQp3vRiXeE4IBE9zufv1q5c1ComJEO7hUDHN+lLT1I3BleeK9uwqWXUKZzpjgVqjmRhQFu7yM0dUKk9YaS2EK8zgpChUir6rpkmBROc/UeI53D4JgBuWde1YqL8+g+LQCsXyRp+mKN6EWYfegmwJz7SdySmNEhtqfVXnJ4wmV3HqHylfa/yGn1SJ2JzwzUu40Ur8IATjiDGpisQYjNc1AOu/32qcybFjl4IHXAIPw2DjjuYTupoiaJWP752s4dzY79sqcB8hAXj7yDPggrNn/nUIUGF8z9oQiveAaK3uOt1B82qwSpMA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=ulb.be; dmarc=pass action=none header.from=ulb.be; dkim=pass header.d=ulb.be; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ulb.be; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JKVox1HLLFf8/zBKWsG3VbOj5bA21L6ld1G4ZzXGRqQ=; b=c0uB0SJV7qQ6u2jMqElq413K7dIdrIVb2kOvAYb/nfKFsJfbeH1qBtfC4s7OWg3O63Cib5tWEl5ATAR+ycoCr6sPa/9cI/eB4vj61ou4dQGJfGZEV+Pd6TK59jrzB0/ekr2GoFI4/+jv2OSBQyXOjNslq9rro3E0QFbl8ospQh0= Received: from AM7P190MB0632.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:11e::20) by AM7P190MB0662.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:115::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.14; Thu, 16 Dec 2021 17:42:08 +0000 Received: from AM7P190MB0632.EURP190.PROD.OUTLOOK.COM ([fe80::35cc:524e:53a6:805f]) by AM7P190MB0632.EURP190.PROD.OUTLOOK.COM ([fe80::35cc:524e:53a6:805f%7]) with mapi id 15.20.4778.018; Thu, 16 Dec 2021 17:42:08 +0000 From: =?UTF-8?q?C=C3=A9dric=20Hannotier?= To: notmuch@notmuchmail.org Subject: [PATCH 2/2] completion: use mail_root for path completion in bash/zsh Date: Thu, 16 Dec 2021 18:40:53 +0100 Message-Id: <20211216174053.706313-2-cedric.hannotier@ulb.be> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211216174053.706313-1-cedric.hannotier@ulb.be> References: <20211216174053.706313-1-cedric.hannotier@ulb.be> X-ClientProxiedBy: PR3P250CA0003.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:57::8) To AM7P190MB0632.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:11e::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3bf3b154-fbd3-46dc-8142-08d9c0bb61e1 X-MS-TrafficTypeDiagnostic: AM7P190MB0662:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:580; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +rUT0onJQv7nS4fmih5wRmet6x9U9GTg3muuO1+RLvv922qeyhHKzxI+Y6zTQPyeopedwjc9vApwAg2XJEp2Kl5TQuVpyEV9f6Td+lTz5OpXwPTxzgtunzPNx8Vi7xOkKU8gQUXTim10fqaKeCB4WGSQPozo2tjlSDrzTNULBgax/Ik8rit/4b3IMXwytAVbAHvMaSotcqxDXrl2vSNj4fupUHTdmYJkKIMOOMdhMIQhTXg3RbPzzcfbTZcZohs4hxwVUJ3jpRtArUZumXgY8+lnjQ4J41VXiB5D1eS8B72uD3eetr4e5WEPGku6CU/L/rMIuT0KjagrnQEGBpxbNLeVJHvFDPJxWlTkH2wwPJi9RQqa1sqrZF7exe0WDPR4/gqUQ0Qp4zgMyjwGUTftsZsA5zcp0qAfFEzQuLrDg7KC2UALB2/Xvg5bddwxpr1PR7y9PgXsHMM2TZ0c3sjmbVUGqx6TGtSETnxxq7AUjkCAfPJpmx/K3M5TMWmpAK2x3uLBrhUAOzp3Tdf3HkkMA1pjbDN+JC9NW30ZYkYbxRu4+QzvapjjHmg+HP/f8osmGUvQpAL9ecb2SEQeKHsOFsiYXZt+HP3bp/3lBqm6WwfDMa30Uqz9M61qlAk/u63clyvFR5VtmRazyYoqDTqjkg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM7P190MB0632.EURP190.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(4636009)(366004)(66476007)(2616005)(8676002)(66556008)(36756003)(8936002)(83380400001)(52116002)(508600001)(6916009)(86362001)(186003)(6506007)(66946007)(5660300002)(4326008)(786003)(6512007)(6486002)(6666004)(1076003)(38100700002)(2906002)(316002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bqLfZeMDwLsSWetEAwtzX2bAQN1dtjCcmOmwuahiYS3V2LGFo2wBgfNV/mpw?= =?us-ascii?Q?2ObsMpJsri+NmMqOaIEDn2g6hQbsvB9ZPJ9gg7zp2CC7uxucea+5Uwi1lyFX?= =?us-ascii?Q?rvIwjgBgrbkql17hrXaS6tQvR19RUjztyVcwn2P+hTz5NejFSDGyaBbsszLA?= =?us-ascii?Q?/DqTXkiAHmzrfsw5igSUunKpZWDLeVWUDaqSQjXA5Ud9sZfyh8c0ecgvo7Uq?= =?us-ascii?Q?lCKZt3Z+xOM/xEUNJPP2IdqpaadKNpPR1QYy9jvouWk1brdN61n+rU8uHlKd?= =?us-ascii?Q?2CcS4gcz5bhOEd4kHrDL6cdnaQQftu7llWqDBHPgK3lgWV4CR9o43DiLS834?= =?us-ascii?Q?/NNY7PQLQnHNiViGM2g8RBB8D+LdNau3ryJC8Gshh/tSCAJimAZtFWMb8bsY?= =?us-ascii?Q?nQUus3NJfyT2RzSwSG0dTlw3xlCYimYHTI7loGsuJsF3yaz3Q53VITHaM+2R?= =?us-ascii?Q?fuzNl+s2KbhdwJtPbNH3dPCOD2avraWjjGG7Fshcoqu7D4i60dD7rff4pQ7+?= =?us-ascii?Q?r812Yf2r2db6/00+lt69t4D/Y9SOtNSRm8ONsPnfiNZEz1BRJZUJhlCFgugB?= =?us-ascii?Q?rN+qdSskUfM9JiY+//zhErY/MVum4aNkcAi1Hzku095YbCoA8Rf2iLu+UCVW?= =?us-ascii?Q?W7lRbfkG07hf2WLUuZ39e4SxytZUQMdu/eUOJvq8yNBdc3mY/gqKfPZHI5yX?= =?us-ascii?Q?ZndULBtXCX8MrcQPovRQu7va9JZzbKA0WVsE+10oXezLj4fd1QnNhJUj7ZM1?= =?us-ascii?Q?AOHlxgp13mTo4A05mPceCqeLZoLK3ZB1HAKu15T1wKeoLF6rak+0uicRAi7M?= =?us-ascii?Q?mDZgA8janeRdcVB8XJcrmx3SDK+haqtk07l61bA6H285PzdH3NH1X9Bzch16?= =?us-ascii?Q?MD0+2M0cwpbXkBROeRVhAJBN2e0AfY2NgPZaWc/Q4Y+42Wiz9ByrmCuSvnb7?= =?us-ascii?Q?TfWCsXsdlulXP0A2XmE7pge2PX5AVg4/neHwiHfiLQiPdzRoJ3AL7XQX5p4k?= =?us-ascii?Q?QKbs7rGfOA82OptkxbExoYx4NS4kZJWWa7HnpUG5ixYx5iwB7Fz39/4w3D6F?= =?us-ascii?Q?77SLAM5NiueFFV4FdtIj/aHkJ94XpJgHxn+zfPEL9llZAsCx1zCIvYzEsyTz?= =?us-ascii?Q?P6E13SnDZtzz4CLF0TWc+UEuXhcuFGyrFfEKUUJ8iqR5+iGQCqJgq1birxGY?= =?us-ascii?Q?ZWh6O6ud6PtGW0iZOWagqMlfd0KWM4mAvSOD8XAvqncr4A930D1Pya/UBMfn?= =?us-ascii?Q?NCtv4chZURYuDZzwyz0JImhyPuXQImuLNvSFhTTiPLOn53vZUmssyLOeymQI?= =?us-ascii?Q?cIBvfm1NTTTjVgCBuMVyirbgrT1HfKCdvurfmuX2Zt9HezbIW7x6nBbpSE80?= =?us-ascii?Q?gEq7dF63b5WzdcGFmBjbtLqL6MQ6UU1PQH6AS2IzqyYJIejbpCmsobbU6ksN?= =?us-ascii?Q?PPUs9deFecbGyNdGg0b0zQxMoaZaFx5BAePHvL0r008VxXjuDRhrAkPmQU2L?= =?us-ascii?Q?nvZ++MPLZCp/8CGa6p/2Z5mIxJky9Gi88t5ktgHTaeqFj7B6+6GUutYyQsQm?= =?us-ascii?Q?5t4HOo7/mcNrhWyFS0EGFrNMgEktvKUyiyRoesfpgy00uHp9zWjBYJgDpADB?= =?us-ascii?Q?unOK27ghAqOYUudTf0Z0t/eMh1PPtkbVxyy6JIrfCGTnUazElGg7QThMMY2M?= =?us-ascii?Q?FfhRATUvSdyen0uUpINOmFsmqeo=3D?= X-OriginatorOrg: ulb.be X-MS-Exchange-CrossTenant-Network-Message-Id: 3bf3b154-fbd3-46dc-8142-08d9c0bb61e1 X-MS-Exchange-CrossTenant-AuthSource: AM7P190MB0632.EURP190.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Dec 2021 17:42:08.4001 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 30a5145e-75bd-4212-bb02-8ff9c0ea4ae9 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: r3o/AHoP3qXG5dI0v/TAEm5l2UG4+tNVpzNkOnB3KE08ccHhkVmvNGrmhoRfqgMIFf0V9i5LyWS4dTJApc2zHw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7P190MB0662 X-MailFrom: cedric.hannotier@ulb.be X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0 Message-ID-Hash: 776G5WMUVZPMZ24PQHJEFNDROENGCLKO X-Message-ID-Hash: 776G5WMUVZPMZ24PQHJEFNDROENGCLKO X-Mailman-Approved-At: Thu, 16 Dec 2021 12:56:09 -0500 CC: =?UTF-8?q?C=C3=A9dric=20Hannotier?= X-Mailman-Version: 3.3.3 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-Country: FR ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1639677376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-owner:list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=/YRsRpRAQVwJyqugIgWyv1B8TYD8DpPqGoE3lD4hHzA=; b=TipTO8BjAUpyXQ5b+NxhLUsE95AFVcoKE9XaiYYwQwLIo93ooD9/YFO+PG9SCFuQ74JeYA SkI3dJF2lluQ6YIK3bIQDKLOjhqiKBaP3DmX2DgRyXFT/wpysY4AoK7vl8WIH414OojXyN MmQUso7VfAPPRs1s/lkLhA4UqQ0rXcaTM6psS8LRNAdwC9CTpevhmu4cV4iqDNZeI9rLb4 Ml+GGfsc0YKtUCjdu4vQOd5UhsokAPs4LVX77NWH6S7CvGSxK7sBPsB3A6+QgpuRUBn8dC ngntPdzP8RIULbAG9GatL1dDm9re5ysBDrXVKFmc742lRkgG4wIwb54zC7Q7Zg== ARC-Seal: i=2; s=key1; d=yhetil.org; t=1639677376; a=rsa-sha256; cv=fail; b=A30zYWeyXx7UT/8yzf9DzdJizQ6/a9jD+P8TJM2woKN7jZjTWGBgEzFQsJ9GT6cKACuTgV kZDC2lJ+XM6KAcS0oy4a5SKsKNyH5r+jerEkx89GLBBAV848bJTZ0+Ki5t75kEds6rUppM liByFpltixomRGxf6Qr6lNCX3CNxXjkSHsFb8jxUYPlCBBWFDOusp7PNSOKc1AW2otYAXX DkkhxDhCyWKNX3NmTJUDE65XTkqTIgcF8rn3lr2jW9xvZgqM1m8LBGbCATRv8kbmoxFJwA p5I+IrOtOqKpWyK3Xr0R73VH5p7ECuQWtCyB0ZlHITSMX/bRizAb+rCXUB9Usg== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=ulb.be header.s=selector2 header.b=c0uB0SJV; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=fail reason="SPF not aligned (relaxed)" header.from=ulb.be (policy=quarantine); spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: 6.00 X-Spam: Yes Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=ulb.be header.s=selector2 header.b=c0uB0SJV; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=fail reason="SPF not aligned (relaxed)" header.from=ulb.be (policy=quarantine); spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 65A6CF6C8 X-Spam-Score: 6.00 X-Migadu-Spam: Yes X-Migadu-Scanner: scn0.migadu.com X-TUID: sPu3UMwv9i/d Since mail store and database directory can be different, path and folder completions must use the directory given by database.mail_root, not by database.path. --- completion/notmuch-completion.bash | 6 +++--- completion/zsh/_notmuch | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash index 15425697..0022b54b 100644 --- a/completion/notmuch-completion.bash +++ b/completion/notmuch-completion.bash @@ -103,12 +103,12 @@ _notmuch_search_terms() COMPREPLY=( $(compgen -P "from:" -W "`_notmuch_email ${cur}`" -- ${cur##from:}) ) ;; path:*) - local path=`notmuch config get database.path` + local path=`notmuch config get database.mail_root` compopt -o nospace COMPREPLY=( $(compgen -d "$path/${cur##path:}" | sed "s|^$path/||" ) ) ;; folder:*) - local path=`notmuch config get database.path` + local path=`notmuch config get database.mail_root` compopt -o nospace COMPREPLY=( $(compgen -d "$path/${cur##folder:}" | \ sed "s|^$path/||" | grep -v "\(^\|/\)\(cur\|new\|tmp\)$" ) ) @@ -281,7 +281,7 @@ _notmuch_insert() $split && case "${prev}" in --folder) - local path=`notmuch config get database.path` + local path=`notmuch config get database.mail_root` compopt -o nospace COMPREPLY=( $(compgen -d "$path/${cur}" | \ sed "s|^$path/||" | grep -v "\(^\|/\)\(cur\|new\|tmp\)$" ) ) diff --git a/completion/zsh/_notmuch b/completion/zsh/_notmuch index e920f10b..e207d90b 100644 --- a/completion/zsh/_notmuch +++ b/completion/zsh/_notmuch @@ -69,8 +69,8 @@ _notmuch_term_mimetype() { _notmuch_term_path() { local ret=1 expl - local maildir="$(notmuch config get database.path)" - [[ -d $maildir ]] || { _message -e "database.path not found" ; return $ret } + local maildir="$(notmuch config get database.mail_root)" + [[ -d $maildir ]] || { _message -e "database.mail_root not found" ; return $ret } _description notmuch-folder expl 'maildir folder' _files "$expl[@]" -W $maildir -/ && ret=0 @@ -79,8 +79,8 @@ _notmuch_term_path() { _notmuch_term_folder() { local ret=1 expl - local maildir="$(notmuch config get database.path)" - [[ -d $maildir ]] || { _message -e "database.path not found" ; return $ret } + local maildir="$(notmuch config get database.mail_root)" + [[ -d $maildir ]] || { _message -e "database.mail_root not found" ; return $ret } _description notmuch-folder expl 'maildir folder' local ignoredfolders=( '*/(cur|new|tmp)' ) -- 2.34.1