From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 19113 invoked from network); 1 Jun 2020 17:06:19 -0000 Received: from ns1.primenet.com.au (HELO primenet.com.au) (203.24.36.2) by inbox.vuxu.org with ESMTPUTF8; 1 Jun 2020 17:06:19 -0000 Received: (qmail 315 invoked by alias); 1 Jun 2020 17:06:09 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: List-Unsubscribe: X-Seq: 45949 Received: (qmail 9362 invoked by uid 1010); 1 Jun 2020 17:06:09 -0000 X-Qmail-Scanner-Diagnostics: from mail-wr1-f67.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.102.3/25828. spamassassin: 3.4.4. Clear:RC:0(209.85.221.67):SA:0(-2.0/5.0):. Processed in 1.582928 secs); 01 Jun 2020 17:06:09 -0000 X-Envelope-From: doron.behar@gmail.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: pass (ns1.primenet.com.au: SPF record at _netblocks.google.com designates 209.85.221.67 as permitted sender) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=jketGuXCRa/XEttoHREu/FD2qlsGCiDg0rOkijHI3tg=; b=TLou078qUSFXSWkXvPsg2xZxjlI5w0W1IkDyOWUtzF/rkWZmD81V9Fgzrlb+0PW0pO 75js8a49sf2XOQacbuZNkgjKkPKZzx7/4742XYluIetHMHg5W+89zsDZLWgN6PtQsWr9 sbcNYvzcWvHvJ13utPm9XOsLfBYiHF9PNHS2D63yi71uCfazBTrPhaOcCj2E8B+JIUYQ 0OL+zVhFOGWpJ0zc8xmXVdwVpmvgH1rmwDUh5tASEzFVrQRGTF+QPZyJ/bXeMlKLZu60 NOICLu0w6kn8Fk9RnnIuLNieUCGSbV1wcYLvDx/ie0PCG8wn0xQPEQBwZZJZHWMIMc7O woKw== X-Gm-Message-State: AOAM532G6RqjSfbkVJUPgRVSZayx7WuX3fYSBAW8GAL06QoUS3Wf0w6i 7jG30IZmpsbHYC1IlFTpovzsCrvM0tY= X-Google-Smtp-Source: ABdhPJw4SsRELc/3CLjtkg9apL/BOhomarpFx7aIQ+qtlbsd/PYz0mzL0NAUmkjDOACrZtTiYaKiAg== X-Received: by 2002:adf:e751:: with SMTP id c17mr21565518wrn.134.1591031131516; Mon, 01 Jun 2020 10:05:31 -0700 (PDT) From: doron.behar@gmail.com To: zsh-workers@zsh.org Subject: [PATCH] modutils completion: Fix FHS assumption Date: Mon, 1 Jun 2020 20:05:19 +0300 Message-Id: <20200601170519.7665-1-doron.behar@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Qmail-Scanner-2.11: added fake Content-Type header Content-Type: text/plain From: Doron Behar --- Completion/Linux/Command/_modutils | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Completion/Linux/Command/_modutils b/Completion/Linux/Command/_modutils index ff6844f41..a0ed7b210 100644 --- a/Completion/Linux/Command/_modutils +++ b/Completion/Linux/Command/_modutils @@ -12,7 +12,18 @@ _modules_caching_policy() _modutils() { local curcontext="$curcontext" expl state line modules modaliases ign args ret=1 local -A opt_args - local -r modules_dir=/lib/modules + local -a possible_modules_dirs=( + # NixOS & possibly Guix + /run/booted-system/kernel-modules/lib/modules + # Mostly every other distro + /lib/modules + ) + local modules_dir tested_modules_dir + for tested_modules_dir in "${possible_modules_dirs[@]}"; do + if [[ -d "$tested_modules_dir" ]]; then + modules_dir="$tested_modules_dir" + fi + done local update_policy zstyle -s ":completion:*:*:$service:*" cache-policy update_policy @@ -108,6 +119,9 @@ _modutils() { all-modules) local kver=${opt_args[(i)(-S|-k|--set-version)]:-$(uname -r)} + if [[ -z "$modules_dir" ]]; then + return + fi if _cache_invalid modules-$kver || ! _retrieve_cache modules-$kver; then modules=( $modules_dir/$kver/(*~(source|build))/**/*.(o|ko|ko.gz|ko.xz)(.:t:r:r) ) -- 2.26.2