Skip to content

Commit dbf876f

Browse files
ggtakecggtakec
authored
Merge pull request #104 from ggtakec/updates
Fixed packaging process and files for debian/ubuntu
2 parents 98cf7cb + ce74a6c commit dbf876f

File tree

2 files changed

+68
-63
lines changed

2 files changed

+68
-63
lines changed

‎buildutils/control.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Source: @PACKAGE_NAME@
22
Section: net
33
Priority: optional
44
Maintainer: @DEV_NAME@ <@DEV_EMAIL@>
5-
Build-Depends: @DEBHELPER_DEP@, dh-systemd (>= 1.5), k2hash-dev (>= 1.0.74), libfullock-dev (>= 1.0.36), libyaml-dev
5+
Build-Depends: @DEBHELPER_DEP@, k2hash-dev (>= 1.0.74), libfullock-dev (>= 1.0.36), libyaml-dev
66
Standards-Version: 3.9.8
77
Homepage: https://@GIT_DOMAIN@/@GIT_ORG@/@GIT_REPO@
88
Vcs-Git: git://@GIT_DOMAIN@/@GIT_ORG@/@[email protected]

‎buildutils/make_variables.sh

+67-62
Original file line numberDiff line numberDiff line change
@@ -38,145 +38,147 @@ func_usage()
3838
echo " -h(help) print help."
3939
echo ""
4040
}
41-
PRGNAME=`basename $0`
42-
MYSCRIPTDIR=`dirname $0`
43-
SRCTOP=`cd ${MYSCRIPTDIR}/..; pwd`
41+
42+
PRGNAME=$(basename "$0")
43+
MYSCRIPTDIR=$(dirname "$0")
44+
SRCTOP=$(cd "${MYSCRIPTDIR}/.." || exit 1; pwd)
4445
RELEASE_VERSION_FILE="${SRCTOP}/RELEASE_VERSION"
4546

4647
#
4748
# Check options
4849
#
4950
PRGMODE=""
5051
while [ $# -ne 0 ]; do
51-
if [ "X$1" = "X" ]; then
52+
if [ -z "$1" ]; then
5253
break;
5354

54-
elif [ "X$1" = "X-h" -o "X$1" = "X-help" ]; then
55-
func_usage $PRGNAME
55+
elif [ "$1" = "-h" ] || [ "$1" = "-help" ]; then
56+
func_usage "${PRGNAME}"
5657
exit 0
5758

58-
elif [ "X$1" = "X-pkg_version" ]; then
59+
elif [ "$1" = "-pkg_version" ]; then
5960
PRGMODE="PKG"
6061

61-
elif [ "X$1" = "X-lib_version_info" ]; then
62+
elif [ "$1" = "-lib_version_info" ]; then
6263
PRGMODE="LIB"
6364

64-
elif [ "X$1" = "X-lib_version_for_link" ]; then
65+
elif [ "$1" = "-lib_version_for_link" ]; then
6566
PRGMODE="LINK"
6667

67-
elif [ "X$1" = "X-major_number" ]; then
68+
elif [ "$1" = "-major_number" ]; then
6869
PRGMODE="MAJOR"
6970

70-
elif [ "X$1" = "X-debhelper_dep" ]; then
71+
elif [ "$1" = "-debhelper_dep" ]; then
7172
PRGMODE="DEBHELPER"
7273

73-
elif [ "X$1" = "X-rpmpkg_group" ]; then
74+
elif [ "$1" = "-rpmpkg_group" ]; then
7475
PRGMODE="RPMGROUP"
7576

7677
else
7778
echo "ERROR: unknown option $1" 1>&2
78-
echo -n "0"
79+
printf '0'
7980
exit 1
8081
fi
8182
shift
8283
done
83-
if [ "X${PRGMODE}" = "X" ]; then
84+
if [ -z "${PRGMODE}" ]; then
8485
echo "ERROR: option is not specified." 1>&2
85-
echo -n "0"
86+
printf '0'
8687
exit 1
8788
fi
8889

8990
#
9091
# Make result
9192
#
92-
if [ ${PRGMODE} = "PKG" ]; then
93-
RESULT=`cat ${RELEASE_VERSION_FILE}`
93+
if [ "${PRGMODE}" = "PKG" ]; then
94+
RESULT=$(cat "${RELEASE_VERSION_FILE}")
9495

95-
elif [ ${PRGMODE} = "LIB" -o ${PRGMODE} = "LINK" ]; then
96-
MAJOR_VERSION=`cat ${RELEASE_VERSION_FILE} | sed 's/["|\.]/ /g' | awk '{print $1}'`
97-
MID_VERSION=`cat ${RELEASE_VERSION_FILE} | sed 's/["|\.]/ /g' | awk '{print $2}'`
98-
LAST_VERSION=`cat ${RELEASE_VERSION_FILE} | sed 's/["|\.]/ /g' | awk '{print $3}'`
96+
elif [ "${PRGMODE}" = "LIB" ] || [ "${PRGMODE}" = "LINK" ]; then
97+
MAJOR_VERSION=$(sed -e 's/["|\.]/ /g' "${RELEASE_VERSION_FILE}" | awk '{print $1}')
98+
MID_VERSION=$(sed -e 's/["|\.]/ /g' "${RELEASE_VERSION_FILE}" | awk '{print $2}')
99+
LAST_VERSION=$(sed -e 's/["|\.]/ /g' "${RELEASE_VERSION_FILE}" | awk '{print $3}')
99100

100101
# check version number
102+
# shellcheck disable=SC2003
101103
expr "${MAJOR_VERSION}" + 1 >/dev/null 2>&1
102104
if [ $? -ge 2 ]; then
103105
echo "ERROR: wrong version number in RELEASE_VERSION file" 1>&2
104-
echo -n "0"
106+
printf '0'
105107
exit 1
106108
fi
109+
# shellcheck disable=SC2003
107110
expr "${MID_VERSION}" + 1 >/dev/null 2>&1
108111
if [ $? -ge 2 ]; then
109112
echo "ERROR: wrong version number in RELEASE_VERSION file" 1>&2
110-
echo -n "0"
113+
printf '0'
111114
exit 1
112115
fi
116+
# shellcheck disable=SC2003
113117
expr "${LAST_VERSION}" + 1 >/dev/null 2>&1
114118
if [ $? -ge 2 ]; then
115119
echo "ERROR: wrong version number in RELEASE_VERSION file" 1>&2
116-
echo -n "0"
120+
printf '0'
117121
exit 1
118122
fi
119123

120124
# make library revision number
121-
if [ ${MID_VERSION} -gt 0 ]; then
122-
REV_VERSION=`expr ${MID_VERSION} \* 100`
123-
REV_VERSION=`expr ${LAST_VERSION} + ${REV_VERSION}`
125+
if [ "${MID_VERSION}" -gt 0 ]; then
126+
REV_VERSION=$((MID_VERSION * 100))
127+
REV_VERSION=$((MID_VERSION * 100))
128+
REV_VERSION=$((LAST_VERSION + REV_VERSION))
124129
else
125-
REV_VERSION=${LAST_VERSION}
130+
REV_VERSION="${LAST_VERSION}"
126131
fi
127132

128-
if [ ${PRGMODE} = "LIB" ]; then
133+
if [ "${PRGMODE}" = "LIB" ]; then
129134
RESULT="${MAJOR_VERSION}:${REV_VERSION}:0"
130135
else
131136
RESULT="${MAJOR_VERSION}.0.${REV_VERSION}"
132137
fi
133138

134-
elif [ ${PRGMODE} = "MAJOR" ]; then
135-
RESULT=`cat ${RELEASE_VERSION_FILE} | sed 's/["|\.]/ /g' | awk '{print $1}'`
139+
elif [ "${PRGMODE}" = "MAJOR" ]; then
140+
RESULT=$(sed 's/["|\.]/ /g' "${RELEASE_VERSION_FILE}" | awk '{print $1}')
136141

137-
elif [ ${PRGMODE} = "DEBHELPER" ]; then
142+
elif [ "${PRGMODE}" = "DEBHELPER" ]; then
138143
# [NOTE]
139144
# This option returns debhelper dependency string in control file for debian package.
140145
# That string is depended debhelper package version and os etc.
141146
# (if not ubuntu/debian os, returns default string)
142147
#
143-
apt-cache --version >/dev/null 2>&1
144-
if [ $? -eq 0 ]; then
145-
IS_OS_UBUNTU=0
146-
if [ -f /etc/lsb-release ]; then
147-
grep [Uu]buntu /etc/lsb-release >/dev/null 2>&1
148-
if [ $? -eq 0 ]; then
149-
IS_OS_UBUNTU=1
150-
fi
151-
fi
148+
OS_ID_STRING=$(grep '^ID[[:space:]]*=[[:space:]]*' /etc/os-release | sed -e 's|^ID[[:space:]]*=[[:space:]]*||g' -e 's|^[[:space:]]*||g' -e 's|[[:space:]]*$||g')
152149

153-
DEBHELPER_MAJOR_VER=`apt-cache show debhelper 2>/dev/null | grep Version 2>/dev/null | awk '{print $2}' 2>/dev/null | sed 's/\..*/ /g' 2>/dev/null`
154-
expr "${DEBHELPER_MAJOR_VER}" + 1 >/dev/null 2>&1
155-
if [ $? -ne 0 ]; then
156-
DEBHELPER_MAJOR_VER=0
157-
else
158-
DEBHELPER_MAJOR_VER=`expr "${DEBHELPER_MAJOR_VER}" + 0`
159-
fi
160-
if [ ${DEBHELPER_MAJOR_VER} -lt 10 ]; then
161-
RESULT="debhelper (>= 9), autotools-dev"
162-
else
163-
if [ ${IS_OS_UBUNTU} -eq 1 ]; then
164-
RESULT="debhelper (>= 10)"
150+
DEBHELPER_MAJOR_VER=$(apt-cache show debhelper 2>/dev/null | grep Version 2>/dev/null | awk '{print $2}' 2>/dev/null | sed 's/\..*/ /g' 2>/dev/null)
151+
# shellcheck disable=SC2003
152+
expr "${DEBHELPER_MAJOR_VER}" + 1 >/dev/null 2>&1
153+
if [ $? -ne 0 ]; then
154+
DEBHELPER_MAJOR_VER=0
155+
fi
156+
157+
if [ -n "${OS_ID_STRING}" ]; then
158+
if [ "${OS_ID_STRING}" = "debian" ]; then
159+
RESULT="debhelper (>= 9.20160709) | dh-systemd, autotools-dev"
160+
161+
elif [ "${OS_ID_STRING}" = "ubuntu" ]; then
162+
if [ ${DEBHELPER_MAJOR_VER} -lt 10 ]; then
163+
RESULT="debhelper (>= 9.20160709) | dh-systemd, autotools-dev"
165164
else
166-
RESULT="debhelper (>= 10), autotools-dev"
165+
RESULT="debhelper (>= 9.20160709) | dh-systemd"
167166
fi
167+
else
168+
# Not debian/ubuntu, set default
169+
RESULT="debhelper (>= 9.20160709) | dh-systemd, autotools-dev"
168170
fi
169171
else
170-
# Not debian/ubuntu, set default
171-
RESULT="debhelper (>= 10), autotools-dev"
172+
# Unknown OS, set default
173+
RESULT="debhelper (>= 9.20160709) | dh-systemd, autotools-dev"
172174
fi
173175

174-
elif [ ${PRGMODE} = "RPMGROUP" ]; then
176+
elif [ "${PRGMODE}" = "RPMGROUP" ]; then
175177
# [NOTE]
176178
# Fedora rpm does not need "Group" key in spec file.
177179
# If not fedora, returns "NEEDRPMGROUP", and you must replace this string in configure.ac
178180
#
179-
if [ -f /etc/fedora-release ]; then
181+
if grep -q '^ID[[:space:]]*=[[:space:]]*["]*fedora["]*[[:space:]]*$' /etc/os-release; then
180182
RESULT=""
181183
else
182184
RESULT="NEEDRPMGROUP"
@@ -186,12 +188,15 @@ fi
186188
#
187189
# Output result
188190
#
189-
echo -n $RESULT
191+
printf '%s' "${RESULT}"
190192

191193
exit 0
192194

193195
#
194-
# VIM modelines
195-
#
196-
# vim:set ts=4 fenc=utf-8:
196+
# Local variables:
197+
# tab-width: 4
198+
# c-basic-offset: 4
199+
# End:
200+
# vim600: noexpandtab sw=4 ts=4 fdm=marker
201+
# vim<600: noexpandtab sw=4 ts=4
197202
#

0 commit comments

Comments
 (0)