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=-3.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 15356 invoked from network); 22 Sep 2023 02:50:38 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 22 Sep 2023 02:50:38 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1695351038; b=g83Jtrvg9FsyXxhiHqJLAuFgSWM+tt9fyJawPX3wsdfTL1VQApJrsq2idaaZv2mCJqNX94q6uc VPRUDX+8O3PNEdDufMcVnh9SORjS0QViw/6dqFIKQj3/lBmXOFgHJnSSGGjgQf8mbzXTa8t8ZA mErXDOk9TD0k5lVyd4lBrLRrouwuXJ6rNmj7agPIEIAeNA8CJETAuAwIJGj5Mo9VN/QPGKg/H7 W4BPTqaRo+1pdETKNGZNtusXkCpoF8uuWr8AfMoa7oi7Xky1NHDq7CifsNz/IaEGEV7FY/8iyW PZJ1Kx/QZRHOOOPgGiKgdqQLMkzO16d2RbFUnKBzc+X3kg==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-pj1-f48.google.com) smtp.remote-ip=209.85.216.48; dkim=pass header.d=gmail.com header.s=20230601 header.a=rsa-sha256; dmarc=pass header.from=gmail.com; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1695351038; bh=t7oIxoOjfmxJ5A2f40bY9r8y3Pnn/vm9BN3g6o4lyZU=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Transfer-Encoding:MIME-Version:Message-ID:Date: Subject:Cc:To:From:DKIM-Signature:DKIM-Signature; b=FcJRsYN8vpTnFZ4cyMXlx2Qinyw3Gg2CtTcgnq+qoHEHAXd8vmULzeGLo/j9BCgqpqxe+3kJaR yaOcSCQZcSbh+GblJCd/njTzdW/JLDZtsBefudRfmoVzWQUaAWQ/h5A3b48E1J0elq3OkGWZMz gVAdy73DicVxSasnz6FZJAgPQDB9m4aI+rdoZjSq0B5CSN0zgemWDJ31p+ZdN9mJGbgK/oQpcD tJx9iMcbK2EHgvCM+14JshdI2nouDuWU4SFrr1vw+0Snc7gHdqVqnSgjI4/61MZQj7f0JSx9XL nD/pJ/H3ttguQ0Dxq9BqWULAJobivVliL69EhvaWbxWWWg==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References; bh=rwxn8EazG2lE6eMpSg/cAu/kawk9rD3avk9G4xYy0DM=; b=BC8g1o5/F2ou5Ijcr7WIidgQux Qi/Kn88BP8SG8Lh1WCjCjKiDxhHYEteuWeQfbHsuGVw0PhOEPsSgHFUPx11b/lveco5iveIrU6JzT UYSNGvxIrWQJgKimpheL/nG0XqGrsu3epDXKK4PFQ099U5nhEBEk6Ul8xbyxh1RpHWLj7u2Mx6wrY +k2O51tKSQrsDZqa/icr4PZrZhScLqEMkK1BWK0xFETeZTH2fYE4RUpT8TYdQSUH6OOWYZN4Sv9QR 3r6GU4jgeL5j6twhBX1aKeUf/PVP8JoaU6TN0ptoVEYwQXqiKqVxNpbbUzFnOo3tTJZwVj1S7Wf1r aYKk/XPA==; Received: by zero.zsh.org with local id 1qjWFY-000Hy4-AR; Fri, 22 Sep 2023 02:50:36 +0000 Authentication-Results: zsh.org; iprev=pass (mail-pj1-f48.google.com) smtp.remote-ip=209.85.216.48; dkim=pass header.d=gmail.com header.s=20230601 header.a=rsa-sha256; dmarc=pass header.from=gmail.com; arc=none Received: from mail-pj1-f48.google.com ([209.85.216.48]:52510) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1qjWFE-000HfR-5C; Fri, 22 Sep 2023 02:50:19 +0000 Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-27496d4e13bso1172064a91.1 for ; Thu, 21 Sep 2023 19:50:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695351014; x=1695955814; darn=zsh.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=rwxn8EazG2lE6eMpSg/cAu/kawk9rD3avk9G4xYy0DM=; b=mS+TAF133Yj/B11WeD3e4k+9aezheYYUupeQdZ4lxrGvKv99os+W3jvze/yH+FNcdD 7ZJGKmMVtLENuzDWYrfsL8f8NnRd6aZJysWkYNLIyagAGMwMqF9QHCZ8N9bDROUPzgGO yQ6hL1RSX2+QU5stQCQIohjtt69Wa5KL5rdDbPQ/mcZxbQ08qw/DRnX1kPMJVyoa3Ese xvsFbE9EoucVBM4vPpAEHe/8bRVNgAp9KZAND5AreCltiCKk+SonpNouzy6QIsRV5uUm eZkJQcY1NDWhmZuKH5KdCmF6pw9YC0TAaynZbs8l5RuhPgFfMN1OeUAKB3vcDaYUfVt3 XaVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695351014; x=1695955814; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=rwxn8EazG2lE6eMpSg/cAu/kawk9rD3avk9G4xYy0DM=; b=rWOu5l7G5gipmCGwh0G8dfffo5rvKJI8Q3H2qf+M4QQkihrE/+/JAOy/YYNFqzFMXg 3WMJIKpCjwuQ9WZnOfGHSRz7K5r85lAjW9bKrnIEcg+1SKTxuPkq6nlx2d1KQOtwTvQq Y+4U9impVfDcj9VxaP5iAVGH/7vn/Py7krgedTOWDD/hjSNwODI/XKBT2MHNomXpYUnO 6WcZmxS/mDCk4WZkHFhpXpO8R94ptCDbwVx/QjjfKBAEFg1X0XAvz8GQVlWrzVZ+JjDl oghmhlxa7Q+KGuxukJno5YRKwXsmfyawgleeAJHF1wjfVcIMUnGUsod+x8Y5ST/Aq0R1 Wcjw== X-Gm-Message-State: AOJu0YyxgsnmN9qJse6LXD+kSvFpEXa39wVilrt+LS4oZrmJXN7ExpbW vKKRJ0Hby62bKO0K9PohP31nTLpTm9A= X-Google-Smtp-Source: AGHT+IGyvoZWCJg8WqfFZPPkjCD71Z/m4Qt/GTwDOODxlfs+Umvt5AwuA5jv65PpCQTFHgszGvyY6g== X-Received: by 2002:a17:90b:4cca:b0:273:ef1b:5a2 with SMTP id nd10-20020a17090b4cca00b00273ef1b05a2mr7109943pjb.47.1695351014638; Thu, 21 Sep 2023 19:50:14 -0700 (PDT) Received: from localhost.localdomain (49.212.151.152.v6.sakura.ne.jp. [2403:3a00:202:1112:49:212:151:152]) by smtp.gmail.com with ESMTPSA id fa18-20020a17090af0d200b002739282db53sm3822634pjb.32.2023.09.21.19.50.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 19:50:14 -0700 (PDT) From: Shohei YOSHIDA To: zsh-workers@zsh.org Cc: Shohei YOSHIDA Subject: [PATCH] Fix gradlew completion Date: Fri, 22 Sep 2023 11:50:03 +0900 Message-Id: <20230922025003.33716-1-syohex@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Seq: 52170 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: , List-Subscribe: , List-Unsubscribe: , List-Post: List-Owner: List-Archive: gradlew is not usually in the PATH so the command to retrieve tasks would fail due to 'command not found'. So it should execute './gradlew' instead of 'gradle' if service is gradlew and there is an executable file './gradlew' in current directory --- Completion/Unix/Command/_gradle | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Completion/Unix/Command/_gradle b/Completion/Unix/Command/_gradle index c1f7c05ee..734429288 100644 --- a/Completion/Unix/Command/_gradle +++ b/Completion/Unix/Command/_gradle @@ -91,8 +91,13 @@ if [[ $state == task && ! -prefix - ]]; then if _cache_invalid $cache_name || ! _retrieve_cache $cache_name; then zle -R "Generating cache from $gradle_buildfile" + local gradle_command=$service + if [[ $service == gradlew && -x ./gradlew ]]; then + gradle_command='./gradlew' + fi + # Run gradle/gradlew and retrieve possible tasks. - for outputline in ${(f)"$($service --build-file $gradle_buildfile -q tasks --all)"}; do + for outputline in ${(f)"$($gradle_command --build-file $gradle_buildfile -q tasks --all)"}; do # Tasks and subprojects each start with a lowercase letter, but whereas tasks are in camelCase, each # subproject consists of one or more sections of kebab-case, with each section ending in a ':'. -- 2.39.2