Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/squid/
Date: Wed, 31 Aug 2022 03:50:54
Message-Id: 1661917813.1e46ca91ad9036086c17150bce6cb00ba018fdbb.sam@gentoo
1 commit: 1e46ca91ad9036086c17150bce6cb00ba018fdbb
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 31 03:50:13 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 31 03:50:13 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e46ca91
7
8 net-proxy/squid: use Bash tests
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 net-proxy/squid/squid-4.15-r3.ebuild | 4 ++--
13 net-proxy/squid/squid-4.17-r1.ebuild | 4 ++--
14 net-proxy/squid/squid-5.4.1-r2.ebuild | 4 ++--
15 3 files changed, 6 insertions(+), 6 deletions(-)
16
17 diff --git a/net-proxy/squid/squid-4.15-r3.ebuild b/net-proxy/squid/squid-4.15-r3.ebuild
18 index b41ec27dec43..fa02246b5aea 100644
19 --- a/net-proxy/squid/squid-4.15-r3.ebuild
20 +++ b/net-proxy/squid/squid-4.15-r3.ebuild
21 @@ -11,7 +11,7 @@ HOMEPAGE="http://www.squid-cache.org/"
22 # Upstream patch ID for the most recent bug-fixed update to the formal release.
23 r=
24 #r=-20181117-r0022167
25 -if [ -z "$r" ]; then
26 +if [[ -z "${r}" ]]; then
27 SRC_URI="http://www.squid-cache.org/Versions/v${PV%.*}/${P}.tar.xz"
28 else
29 SRC_URI="http://www.squid-cache.org/Versions/v${PV%.*}/${P}${r}.tar.bz2"
30 @@ -274,7 +274,7 @@ src_install() {
31
32 pkg_postinst() {
33 elog "A good starting point to debug Squid issues is to use 'squidclient mgr:' commands such as 'squidclient mgr:info'."
34 - if [ ${#r} -gt 0 ]; then
35 + if [[ ${#r} -gt 0 ]]; then
36 elog "You are using a release with the official ${r} patch! Make sure you mention that, or send the output of 'squidclient mgr:info' when asking for support."
37 fi
38 }
39
40 diff --git a/net-proxy/squid/squid-4.17-r1.ebuild b/net-proxy/squid/squid-4.17-r1.ebuild
41 index e3ab95c2f679..106d72f54d7e 100644
42 --- a/net-proxy/squid/squid-4.17-r1.ebuild
43 +++ b/net-proxy/squid/squid-4.17-r1.ebuild
44 @@ -11,7 +11,7 @@ HOMEPAGE="http://www.squid-cache.org/"
45 # Upstream patch ID for the most recent bug-fixed update to the formal release.
46 r=
47 #r=-20181117-r0022167
48 -if [ -z "$r" ]; then
49 +if [[ -z "${r}" ]]; then
50 SRC_URI="http://www.squid-cache.org/Versions/v${PV%.*}/${P}.tar.xz"
51 else
52 SRC_URI="http://www.squid-cache.org/Versions/v${PV%.*}/${P}${r}.tar.bz2"
53 @@ -276,7 +276,7 @@ src_install() {
54
55 pkg_postinst() {
56 elog "A good starting point to debug Squid issues is to use 'squidclient mgr:' commands such as 'squidclient mgr:info'."
57 - if [ ${#r} -gt 0 ]; then
58 + if [[ ${#r} -gt 0 ]]; then
59 elog "You are using a release with the official ${r} patch! Make sure you mention that, or send the output of 'squidclient mgr:info' when asking for support."
60 fi
61 }
62
63 diff --git a/net-proxy/squid/squid-5.4.1-r2.ebuild b/net-proxy/squid/squid-5.4.1-r2.ebuild
64 index e2ca2e516dbd..94456703bd17 100644
65 --- a/net-proxy/squid/squid-5.4.1-r2.ebuild
66 +++ b/net-proxy/squid/squid-5.4.1-r2.ebuild
67 @@ -12,7 +12,7 @@ MY_PV_MAJOR=$(ver_cut 1)
68 # Upstream patch ID for the most recent bug-fixed update to the formal release.
69 r=
70 #r=-20181117-r0022167
71 -if [ -z "$r" ]; then
72 +if [[ -z "${r}" ]]; then
73 SRC_URI="http://www.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}.tar.xz"
74 else
75 SRC_URI="http://www.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}${r}.tar.bz2"
76 @@ -278,7 +278,7 @@ src_install() {
77
78 pkg_postinst() {
79 elog "A good starting point to debug Squid issues is to use 'squidclient mgr:' commands such as 'squidclient mgr:info'."
80 - if [ ${#r} -gt 0 ]; then
81 + if [[ ${#r} -gt 0 ]]; then
82 elog "You are using a release with the official ${r} patch! Make sure you mention that, or send the output of 'squidclient mgr:info' when asking for support."
83 fi
84 }