Gentoo Archives: gentoo-commits

From: Andrew Savchenko <bircoph@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-mobilephone/sobexsrv/files/
Date: Sun, 12 Feb 2017 09:28:33
Message-Id: 1486891703.86594d4db4c4d69b0ef7ec5c431d96f35aeca021.bircoph@gentoo
1 commit: 86594d4db4c4d69b0ef7ec5c431d96f35aeca021
2 Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 12 09:20:20 2017 +0000
4 Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 12 09:28:23 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86594d4d
7
8 app-mobilephone/sobexsrv: remove bashisms
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11 Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>
12
13 app-mobilephone/sobexsrv/files/init.d_sobexsrv | 26 +++++++++++++-------------
14 1 file changed, 13 insertions(+), 13 deletions(-)
15
16 diff --git a/app-mobilephone/sobexsrv/files/init.d_sobexsrv b/app-mobilephone/sobexsrv/files/init.d_sobexsrv
17 index 6eb22e38b5..cfdfc41559 100644
18 --- a/app-mobilephone/sobexsrv/files/init.d_sobexsrv
19 +++ b/app-mobilephone/sobexsrv/files/init.d_sobexsrv
20 @@ -1,5 +1,5 @@
21 #!/sbin/openrc-run
22 -# Copyright 1999-2004 Gentoo Foundation
23 +# Copyright 1999-2017 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 # $Id$
26
27 @@ -9,23 +9,23 @@ depend() {
28 }
29
30 check_config() {
31 - if [[ -z "${USER}" ]] ; then
32 + if [ -z "${USER}" ] ; then
33 eerror "Please set \$USER in /etc/conf.d/sobexsrv!"
34 return 1
35 fi
36 - if [[ -z "${GROUP}" ]] ; then
37 + if [ -z "${GROUP}" ] ; then
38 eerror "Please set \$GROUP in /etc/conf.d/sobexsrv!"
39 return 1
40 fi
41
42 - if [[ ${CHROOT} == "yes" ]] ; then
43 - if [[ ! -u /usr/bin/sobexsrv ]] ; then
44 + if [ ${CHROOT} = "yes" ] ; then
45 + if [ ! -u /usr/bin/sobexsrv ] ; then
46 eerror "The \$CHROOT option requires /usr/bin/sobexsrv to be suid root!"
47 return 1
48 fi
49 fi
50
51 - if [[ -z "${INBOX}" || ! -e "${INBOX}" ]] ; then
52 + if [ -z "${INBOX}" ] || [ ! -e "${INBOX}" ] ; then
53 eerror "Please configure \$INBOX correctly in /etc/conf.d/sobexsrv!"
54 return 1
55 fi
56 @@ -38,13 +38,13 @@ start() {
57 ebegin "Starting sobexsrv"
58
59 OPTIONS=""
60 - [[ -n "${CHANNEL}" ]] && OPTIONS="${OPTIONS} -c ${CHANNEL}"
61 - [[ -n "${SECURITY_LEVEL}" ]] && OPTIONS="${OPTIONS} -s ${SECURITY_LEVEL}"
62 - [[ "${CHROOT}" == "yes" ]] && OPTIONS="${OPTIONS} -R"
63 - [[ "${DISABLE_OPUSH}" == "yes" ]] && OPTIONS="${OPTIONS} -o"
64 - [[ "${DISABLE_OBEXFTP}" == "yes" ]] && OPTIONS="${OPTIONS} -f"
65 - [[ "${DISABLE_OBEXFTP_LISTING}" == "yes" ]] && OPTIONS="${OPTIONS} -F"
66 - [[ "${USE_SYSLOG}" == "yes" ]] && OPTIONS="${OPTIONS} -S"
67 + [ -n "${CHANNEL}" ] && OPTIONS="${OPTIONS} -c ${CHANNEL}"
68 + [ -n "${SECURITY_LEVEL}" ] && OPTIONS="${OPTIONS} -s ${SECURITY_LEVEL}"
69 + [ "${CHROOT}" = "yes" ] && OPTIONS="${OPTIONS} -R"
70 + [ "${DISABLE_OPUSH}" = "yes" ] && OPTIONS="${OPTIONS} -o"
71 + [ "${DISABLE_OBEXFTP}" = "yes" ] && OPTIONS="${OPTIONS} -f"
72 + [ "${DISABLE_OBEXFTP_LISTING}" = "yes" ] && OPTIONS="${OPTIONS} -F"
73 + [ "${USE_SYSLOG}" = "yes" ] && OPTIONS="${OPTIONS} -S"
74
75 OPTIONS="-I -r ${INBOX} ${OPTIONS} ${SOBEXSRV_OPT}"