From patchwork Thu Sep 3 01:36:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Daniel M. Capella" X-Patchwork-Id: 1768 X-Patchwork-Delegate: johannes@kyriasis.com Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id C9A991AE678C8 for ; Thu, 3 Sep 2020 01:37:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on apollo.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1, MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_MED=-2.3,RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001,SPF_HELO_NONE=0.001,T_DMARC_POLICY_NONE=0.01 autolearn=ham autolearn_force=no version=3.4.4 X-Spam-BL-Results: [127.0.0.19] [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Thu, 3 Sep 2020 01:37:21 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 83FF61D388E1CA; Thu, 3 Sep 2020 01:37:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1599097038; bh=DL5rI2e3stTPH1E6/3EGD6AUHuGKHaWC77UhyPCTjLQ=; h=From:To:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe; b=iUW9QdZoRJIC2x2AXyzjijg6PXa/CrD5VkuLMIzYzMEKqWoVDcffvuc6DwlPYvz65 Sv3s3aqCa78IWEROLgZn8EIJ72yvhKsweU0+wCJHeKhIJjdpRer9c336k+TgbnHbZW 25mCVbIEV2Y28kCOcv9CODq/oEMwhtc42vP+elRUY9a3kgpL1vzzAFft58uG9rB5Bf e25r+zP05tqkdK7/EmfBfLpMam1PLfnPeKGmh1w3q/7GpzpSvNJWEAG8I3qPlRGiPa g8yZUA2S0jQDGN7ua92LJZMsHqZmmLg2f3RQR5dtC2ZDgGjVkBLjBVvOfgWJTg5hac RklCHijUvl3dRZK3jHryyleigeOwb/071UNViAHGNyuDKmIom8DFjUtY3X4hkZ0JFD yuMxFdHIMuhKMYpiwLuB6F/auZSywbAKWbSGEGRyC23F5Thc+kn2oSr7wvzpPSgRyf IdVrXb3bZ8U9zHchEB68PdT7CUR/nxfAhA+jPjKfDzj78pPpIZXm8PAKcX0MiZOQhe +bnUw5llR2qjzhRKhPhpStr+I7Q4eultSGclQigNZuxQP6+TVkZ1NP6x3OdKmpQ6MX dcwFbdmNOdPa3nrKlWYa9qMh7oqK6JKpPlOgTdTnM8NIW//Mv7XQey40Y0A9E0qVwW Kv5zyztkgfFOCdY77KyV9In8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1599097038; bh=DL5rI2e3stTPH1E6/3EGD6AUHuGKHaWC77UhyPCTjLQ=; h=From:To:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe; b=RVvBoMoAjzzOuQt97WptXca3Oh/HDqDuOMzs4j4Zr1fan0g7Hcq7lCaEzLEWVQ7Vf NdTFxccZQY4uZSUPTbyztDp3JoDoHBYBNM0jzyfw4r4ymlGYi4vleL2w8VN6ZCqIiw tqDQIs48a57aAAcNwIEAlih0tO1TPwrcPnrXSvg6K4bXZ6ebOVC5t3diYR5+fuY0Ed DdrAkiN9TJYx0gJ2M6eKvMLMW1h7BlSmE8Y8s6+K3P96UT8iVUruXTZoZvu2yoR8m2 +zsLYi5/4g/FDQLmxrLrPJKo3XW42gOzD+XsH9a1FP4zeblCcoYl5KToVAguNvGxwP 31Qrd7ONRMpc8T1jR18Fy32AwYwOQek4rWHFBAplKEBKmtfRiBInK2N6IgeOyrehFA VGoSe3sUGUOtdRq2yPTwdMwu3aCrrjWb9V4SEL0+t1xoUTsv4yCWrsOAIZWdHW1642 +sBpclhI7hcjTO+EQY2jWRXLEaI4ZxB9kfk6psXHEJTV/Mm58kB/cRm4XLBTX7+JFm OeNrMesyvcKm953jdQshm79SX3yrNQPNXsrhM6ESSsW81vIf6LDbmreORXTWL4DCuC 36Nz98TDVDOFmkD6IjNnoDFMeAQJ+BaxjgV8S3XAZzQtwcS1nhhLRywNvln2owdzBB 621Y1SD2p91t4pCLRAv9horI= From: "Daniel M. Capella" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1599097032; bh=DL5rI2e3stTPH1E6/3EGD6AUHuGKHaWC77UhyPCTjLQ=; h=From:To:Subject:Date; b=U3PCzy9AWfuhoy41N3ZGzSMN/QKDXg4dAicjtstzqBzoNM8+Hxx9L/vaDmV87LN6/ Xp4Lu5PS7rvLludXjtvVGp2PUPlJq8FoOJ6pJNwUYiHSOGow0VURC4o7bqs5D5bfUu clTlrGCSUFwqhAILHlvutr0BwGsJ6xd0ZiC5auDtaIQ71dKkPyI0oy1XQeZ5emYrU7 mJiNDBM1TiJ/C0vVqOKEOTO/HI5fq0Q1hvr/EmAGaCe+4bm3WsMozlahfaeXR77Lr7 UbwFqO9Z6WnKrauejIvq14eQOvST3SBPj/za155lEZwboLSuaccWzEtyeTKoEpAV3A BevXD46iAZiN4U0jR6O+i+NXHcyVqhRcwNvbQhIgJOd/NbJxUKb+VqNvVAvPIONFIB b7EDnHNMQAFHAq5gsuYWid6yU/ebpyuo2qIKUU6sTgMck4lbu2NVHVcIWEtNBXxQYI WaY/BUulwD83lOs/9pe/+5FJGwRFnQCipupjTnDZphhabzrrgwR/OB+FHohRU6bfQ2 WrI5B6eR+DVpWVmskribr8lb7t8AU9kXptg6sSUutXUA9oo+hm7US9A2kSiVrtfIQc 9EmzpvmLhOv1fQgyRcPPyXzCgrFmtdBZCyTG1bChWzjcfV51EOQM3Fh+OqFhak1wCM QZNkOx6UxEIyQgHzip5BCJWg= To: pacman-contrib@lists.archlinux.org Subject: [PATCH 1/3] paccache: Clarify sudo usage Date: Wed, 2 Sep 2020 21:36:53 -0400 Message-Id: <20200903013655.92224-1-polyzen@archlinux.org> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-BeenThere: pacman-contrib@lists.archlinux.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion list for pacman-contrib development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: pacman-contrib-bounces@lists.archlinux.org Sender: "pacman-contrib" "Privilege escalation required" sounds more like an error. Signed-off-by: Daniel M. Capella --- src/paccache.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/paccache.sh.in b/src/paccache.sh.in index 1311fd7..fa53d58 100644 --- a/src/paccache.sh.in +++ b/src/paccache.sh.in @@ -138,11 +138,11 @@ m4_include(../lib/size_to_human.sh) runcmd() { if (( needsroot && EUID != 0 )); then - msg "Privilege escalation required" + msg 'Escalating privileges using sudo' if sudo -v &>/dev/null && sudo -l &>/dev/null; then sudo "$@" else - die 'Unable to escalate privileges using sudo' + die 'Failed to escalate' fi else "$@" From patchwork Thu Sep 3 01:36:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Daniel M. Capella" X-Patchwork-Id: 1767 X-Patchwork-Delegate: johannes@kyriasis.com Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id F0EF01AE678CB for ; Thu, 3 Sep 2020 01:37:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on apollo.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1, MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_MED=-2.3,SPF_HELO_NONE=0.001, T_DMARC_POLICY_NONE=0.01 autolearn=ham autolearn_force=no version=3.4.4 X-Spam-BL-Results: [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Thu, 3 Sep 2020 01:37:22 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 282411D388E1DE; Thu, 3 Sep 2020 01:37:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1599097039; bh=GePcjJGd57eTav0fGlWlDMKqj04HgCeOFd7pvZHLerE=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe; b=L+xFSJd0HQGTDAQEJIHdU/kKWtgKGEyNq1sQuTpWyx76TPJEE0w7rlzbYoPD/A6nP OyXFkX3BNeHmM/F7tXmOg1XXu7VESvlMCGyyZ0L32sKUo91xIsQ7Q9vYYrGPfj/xWZ A2EwGq2GJV/YOC1I7WWmHCDwbLLw77w5fH5ZiEfvKyA1IL/wW7IVd1PoNNUOeu0y8y 0ibhbwz2iUYZV5uqDJSpPlvJNSo+oerKgkNvwMpFY2qQnFtWtdxX3YFCkVME7sCIJU 41Qtxx7N0cpSAhyoLm31HlAde7YN4RZOmQ0KiqLOyy/vII8+6dhVC19EqIx+KHFHuG 3OBGv2Pv4qb+G8aDNoZIvaK1MnB9pH7N3p2o7bb0qzOknBMT2EzmOil/NmCJKvNJV9 TjKnhu1x53hU5tz9bEbKwr5NtRaInq3hwzXLnQ8G/5DfIjcyhu1PD6rNuNwW7s5UH7 KxzR3SUkRgXT4OmTkboqYyu4l8cN5tzUH3eGVfnoS5vnalbwAlRZz5wreB4yWb1fzY 7/+WcdSjeLQF5E0gbQxPtmcc9cWHRq92yW+8tzBokhC9F3k5C7M5fvU0MtRt2kLQkc IGXh+eAnUXMc6R+vla0TzCYOeHkK97yNx/NYnA3tBhHPGyokQ1Zryt7GVFJhFvN1zq 8pijnPtFnXBfhTC7nFHZeEZI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1599097039; bh=GePcjJGd57eTav0fGlWlDMKqj04HgCeOFd7pvZHLerE=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe; b=Z/PPuXeqeIBJg6p6m2IUQgmO6LCnCoTvJ0aosvoihTUsQc1YfEnf7i7T5hFq86Aqs bWlX2xRBYBeyRqmDemYmgqbafjdn6aAZ407l0DPHuapLRfbMAAWPP+ygrj3DkM6/wf T1Nx8LBgcdhHYhhlRNr4Oav7L5nH9eRrNq+AL7GxZlkDzAQhG7qL9z9Jh3Vc0ExMk5 pHGbNldgiS1rErlq4jtrTlddKBESh8Jn3VzG31b6hks09dOS1R9tLwBbPX3bHW5Emn xgwwrTeZy5b+asrJDD9BI6ive2B+Lv2EKTAwIepLRVICriFM81HFldDmUD+WJgyeFd 8/s82kp9JfW6GWEwZ3La5ENoEJgue8kzFFXzr0gI/oHa3CMeo9oSqJ1yQao0nfYWMd FG9gWdLed8/YKyyqdnYQ1XinOfQyPHDVVVtF1aIAtwPIil6NdB1EXNId9bT8wW3oiy Yc4n9URLmwzhhBKZZY4EpHoP8r2UWYV18jiybsZ78zB/4dBAdl1veS2Ck4xZriCbgh 8VBWXP7BD221XVGdxXZsR5YeTxP2FglgfMvT9kB13eO9leHJTVQP5p9MZAZ4Ye7uey 24zFw7m2IYl5rOiJksXgsvqiiawQR8kpQurBwBooQfpHMBwYp+welUWS3hKTurK3RC jqM2tQr7S6EFlq1aptxK2FtI= From: "Daniel M. Capella" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1599097033; bh=GePcjJGd57eTav0fGlWlDMKqj04HgCeOFd7pvZHLerE=; h=From:To:Subject:Date:In-Reply-To:References; b=GSS5MD+OgUIJl3RInmLq/MxVDar7V8cJzwzjxBOh/Pwnz45mz4R69bu5wvDwUnT39 VDhqkp4Qq4IscpCIaESoZm4u8QovV0saoZPaF1y5k8Q+UPx/tgdM4azSPob4YWj1HO WdhvRmDT07deTNo/mxwLLD2CBG/066AfAZ9bZj3xDlNNlsMLsqSRzyzZr7ujyqzF26 yV9ElRnWMYnhhTfrR6pHZskgHrWUrH8n1ix9RWUxv9bBV2HR9qE3+X3xF0E7KkVa/i 4CsXGgaXTjYtpsCtVigkP78rBYL1Nq9SBKdzd2zcpNYZwedBX7zO/9wtYMMHnC6p/8 xruokV53rzizaeDOKyFeCSNIenh5nJeZCzgFFOSZ1+O8i4PyYAWyAMuH4eJpeohbFI 2N/oYPw1lg8eMY22p+m7zE0tpH/qAxUz43bVfRY5h0VolploT7449ZJuVmzlcVYxAC Ph/x230IEgEn3thqqQf/nRG66OUUXv+bnaT78Ga4qaU1yFA9S025ZtwRJgu+mCIF6X 8X9IT3AsXbOtwvI6MAenHEFk8EXpTyrOgqUmWjRfU1dohncuVL/YNwTVGoWwQ9OJrR bk5V6hnTc6CafjDPvD2cKzzQrLCHFmVSAagwZpNvgLVatXCbIj78ek+1C78HWktRjX yaTjP9icGuJJl99TfyhB+eyM= To: pacman-contrib@lists.archlinux.org Subject: [PATCH 2/3] paccache: Normalize single quote usage Date: Wed, 2 Sep 2020 21:36:54 -0400 Message-Id: <20200903013655.92224-2-polyzen@archlinux.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200903013655.92224-1-polyzen@archlinux.org> References: <20200903013655.92224-1-polyzen@archlinux.org> MIME-Version: 1.0 X-BeenThere: pacman-contrib@lists.archlinux.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion list for pacman-contrib development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: pacman-contrib-bounces@lists.archlinux.org Sender: "pacman-contrib" Signed-off-by: Daniel M. Capella --- src/paccache.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/paccache.sh.in b/src/paccache.sh.in index fa53d58..5ab467e 100644 --- a/src/paccache.sh.in +++ b/src/paccache.sh.in @@ -162,7 +162,7 @@ summarize() { printf -v output "finished: %d packages moved to '%s'" "$filecount" "$movedir" elif (( dryrun )); then if (( verbose )); then - msg "Candidate packages:" + msg 'Candidate packages:' while read -r pkg; do if (( verbose >= 3 )); then [[ $pkg =~ $pkg_re ]] && name=${BASH_REMATCH[1]} arch=${BASH_REMATCH[2]} @@ -330,8 +330,8 @@ whitelist=("$@") # sanity checks case $(( dryrun+delete+move )) in - 0) die "no operation specified (use -h for help)" ;; - [^1]) die "only one operation may be used at a time" ;; + 0) die 'no operation specified (use -h for help)' ;; + [^1]) die 'only one operation may be used at a time' ;; esac [[ $movedir && ! -d $movedir ]] && From patchwork Thu Sep 3 01:36:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Daniel M. Capella" X-Patchwork-Id: 1769 X-Patchwork-Delegate: johannes@kyriasis.com Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id 5C98B1AE678DE for ; Thu, 3 Sep 2020 01:37:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on apollo.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1, MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_MED=-2.3,SPF_HELO_NONE=0.001, T_DMARC_POLICY_NONE=0.01 autolearn=ham autolearn_force=no version=3.4.4 X-Spam-BL-Results: [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Thu, 3 Sep 2020 01:37:28 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id A2C5E1D388E1F8; Thu, 3 Sep 2020 01:37:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1599097039; bh=0iGNk8T0xun4X9TBa0p25jnnQFf7OlMDHDd7FN9jZ+0=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe; b=HM1z91BMBXFtKBmhiCtemCBUd/TASy7hhPYSPLnC8rQuxEAjwdP3QFjIpNt24GPiq KDCUbcK3fclQV1RnpiTsc4eWvXzIYH8jjAw4UjGi+hIDP+KovHDiZsvBDFI21bvgK2 8c2kapENPQRPgLLXVHd9LVfIEPQM1D3d6xFaAg2thE2Fh5IaM2HPGVnyujWOVK5HYn xxxw1iRkWDIVNMtS8XoKAjbLiz02xdYPbheD8LS06ix+aMrf6GawBOB5zCKTMiGURD fmXqOGIc5HyOTCMnyZvKvlIFsrOBTDb2oJvyxKvwaJa+g/IBm9Rbj6ghKl88xlzmRa ai3LdkWspvp2U9HBOxMglcq/3QmhnGQcIC9quHRniTq1mUhSCmsieVmjJFfC3oq+1F ChCKs3J41agE/1ZNxk4TIwxVC/dpti3s5qwVUE3pkSRDrBVRgpwbURht3dO1d9gicH tXwgqvGzcnrA+byFG4/OLYEXDIwfLtDPL7eTFHkVOytxb4RJ+rWaUtdWT8P/23UUi+ o9jpImE8k9B4ZveIExwKKnQAOvoVgiOVQ83dQU+LOCcuXF4PHrBXhsbfh4UJOi7Tnn WlN/eLGWe/jDVNJn8QFM3QuQoPsYwUdGyTbp0WcCbLwmFLVj/J7Lb5StKFmOfm3aQR XOgp5IjqZRMi/gTqJXcPbBjA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1599097039; bh=0iGNk8T0xun4X9TBa0p25jnnQFf7OlMDHDd7FN9jZ+0=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe; b=pTTWsz+9Xn3rf155VohysmB5NJwP/ekDbbwZsb8FIQ7QOLEU20kwt/e/GkPnjlgJU SYPe+d41/3+JkEEADsDs27sf9UYSj4lyN0qtC0jalbHwRW1yiU5wERxp+2zRamBm/F gQ5C0FaFenJ1dWTWYYDHM6dx9t8G2kyVKOJEIvenEo6o8xHo7Pjj0qrVhwNCafV6D2 dTgb4S5RopKFgfGhmxG7vjvRIAYrRybzJDoo7OVhIuvjdKySrpHAWlNy13KFSfZZKJ IrzFwEOgiOxp71WTBkVtVshHH8lpY9DsYcLu25eBCqqIg61tTe5gZvfBPONsvTEkXn 7/TTS33FsHuganq6Pw3KhtVmIfCwjCGy6V5Rc1scLazLZbx+e6K1R7lYx4VgC+vNab kNKa7n56vuhpyYsssgCkFVUs+ZPwPEH+XrWkfeqkBykOHExrDz2OA5dgA6B/luvMfX 4SIcrDw90VEKN8G+WbrMINlij77mPbeiGob41m0QCEybW5bo50LRsM+j5ictw8cjny N4tMCn+y2s280GrtVOBtDh/vJYslF8A7aCuEAZUAyRBeYNOYBNjn4o2/rwM3w0oP+u ZF27MM2tDmesMfZ1sFrogxvFN3vvTuSErdJE87JXqvZg77KR8uGirsHCl+oxN2Rnna m0WmgkcwjeF7+j0Kf7gnOXng= From: "Daniel M. Capella" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1599097033; bh=0iGNk8T0xun4X9TBa0p25jnnQFf7OlMDHDd7FN9jZ+0=; h=From:To:Subject:Date:In-Reply-To:References; b=vzxa/Mg0Cq4An2+kXn7uoqeyZ055/74JfDcT3Vi+FmFTorjYnjWtZyMWHvz+go+sL fSFCnXbPTp6dbvWcSU89amtzKnkE+cB55YSQeX40whkF3gDlkISxwph6Ds1UWRDi1K +RnnmnYulsHsKddhNOt+3B8sQo9gMuImAJHR/QYuzaXS11QasybazYIU4X8D06DQBX A01xSzcs6r3u6aCR47lygZl73tvQ/pldEYaN0cnLFYk/qCZAAz+4+rwzzQEQYJqhhM Kgti4ugBCFdKEPGSJf0MHH/x7BJNl3nhIxX6yfGKNm0Gd6iygFMyjwpOP0PLsOz5nW RZZYwk+MQSaZ0kwjFfZi4qr9IE8mWpDNZHqlK+XaJKb0v4fvu498wsin7k3miL1FN8 P9PSAwv3mVwvdV4UIArft7RzL8fkMOr+jn/U37Leu+u9USGX9XBjkp2AzV8+zba45X ISA26eEhFB6ncMWTA11v4B39c6BP1zzA3xiNy9PuHKzmnfbHbcSM6CngWMUqneHNsL yAeF4/ljEwUvH3QLG6ItpTbXbZRhfpXL1PAWXThPJd4fVWYVcr2TFgWlp/mRr8Ng0Q vJvyDe1OOmHukn7mJtUDvOsOoWfw9axCh5dEz5Qq2AOVO9PVeXbhOwRT96mtA+gDs1 xKpaMfB2cRzqBXvYG+jSE8Wo= To: pacman-contrib@lists.archlinux.org Subject: [PATCH 3/3] checkupdates: Do not use sudo when run as root Date: Wed, 2 Sep 2020 21:36:55 -0400 Message-Id: <20200903013655.92224-3-polyzen@archlinux.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200903013655.92224-1-polyzen@archlinux.org> References: <20200903013655.92224-1-polyzen@archlinux.org> MIME-Version: 1.0 X-BeenThere: pacman-contrib@lists.archlinux.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion list for pacman-contrib development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: pacman-contrib-bounces@lists.archlinux.org Sender: "pacman-contrib" runcmd() taken from paccache. Fixes FS#64328 Signed-off-by: Daniel M. Capella --- src/checkupdates.sh.in | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/checkupdates.sh.in b/src/checkupdates.sh.in index ba9b960..67ff144 100644 --- a/src/checkupdates.sh.in +++ b/src/checkupdates.sh.in @@ -30,6 +30,24 @@ USE_COLOR=0 source "$LIBRARY"/util/message.sh source "$LIBRARY"/util/parseopts.sh +die() { + error "$@" + exit 1 +} + +runcmd() { + if (( EUID != 0 )); then + msg 'Escalating privileges using sudo' + if sudo -v &>/dev/null && sudo -l &>/dev/null; then + sudo "$@" + else + die 'Failed to escalate' + fi + else + "$@" + fi +} + usage() { cat << __EOF__ ${myname} v${myver} @@ -80,8 +98,7 @@ else fi if ! type -P fakeroot >/dev/null; then - error 'Cannot find the fakeroot binary.' - exit 1 + die 'Cannot find the fakeroot binary' fi if [[ -z $CHECKUPDATES_DB ]]; then @@ -98,15 +115,14 @@ fi mkdir -p "$CHECKUPDATES_DB" ln -s "${DBPath}/local" "$CHECKUPDATES_DB" &> /dev/null if ! fakeroot -- pacman -Sy --dbpath "$CHECKUPDATES_DB" --logfile /dev/null &> /dev/null; then - error 'Cannot fetch updates' - exit 1 + die 'Cannot fetch updates' fi mapfile -t updates < <(pacman -Qu --dbpath "$CHECKUPDATES_DB" 2> /dev/null | grep -v '\[.*\]') if (( ${#updates[@]} )); then printf '%s\n' "${updates[@]}" if (( DOWNLOAD_CACHE )); then - sudo pacman -Sw --noconfirm "${updates[@]%% *}" --dbpath "$CHECKUPDATES_DB" --logfile /dev/null + runcmd pacman -Sw --noconfirm "${updates[@]%% *}" --dbpath "$CHECKUPDATES_DB" --logfile /dev/null fi else exit 2