blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

core: double quote variables in tools scripts

Browse Source
This commit is contained in:
Sébastien Helleu 2019-11-28 21:23:59 +01:00
parent 45509c3560
commit c0e48b0370
4 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/build-debian.sh
View File

@ -89,7 +89,7 @@ Examples:
$0 test-patches
EOF
exit ${RC}
exit "${RC}"
}
error ()
@ -109,7 +109,7 @@ test_patches ()
set +e
PATCHES_OK=0
PATCHES_ERROR=0
for file in ${ROOT_DIR}/tools/debian/patches/*.patch; do
for file in "${ROOT_DIR}"/tools/debian/patches/*.patch; do
echo "=== Testing patch ${file} ==="
git apply --check "${file}"
if [ $? -eq 0 ]; then
@ -136,7 +136,7 @@ fi
# check git repository
ROOT_DIR=$(git rev-parse --show-toplevel)
if [ -z "${ROOT_DIR}" -o ! -d "${ROOT_DIR}/.git" -o ! -d "${ROOT_DIR}/debian-stable" ]; then
if [ -z "${ROOT_DIR}" ] || [ ! -d "${ROOT_DIR}/.git" ] || [ ! -d "${ROOT_DIR}/debian-stable" ]; then
error "this script must be run from WeeChat git repository."
fi
cd "${ROOT_DIR}"
@ -171,7 +171,7 @@ fi
# convert version "stable" to its number
if [ "${VERSION}" = "stable" ]; then
VERSION="$(${ROOT_DIR}/version.sh stable)"
VERSION="$("${ROOT_DIR}/version.sh" stable)"
fi
if [ -z "${VERSION}" ]; then
@ -205,7 +205,7 @@ if [ "${VERSION}" = "devel" ]; then
# devel packages: weechat-devel(-xxx)_X.Y-1~dev20150511_arch.deb
DEB_DIR="debian-devel"
DEB_NAME="weechat-devel"
DEB_VERSION="$(${ROOT_DIR}/version.sh devel)-1~dev$(date '+%Y%m%d')"
DEB_VERSION="$("${ROOT_DIR}/version.sh" devel)-1~dev$(date '+%Y%m%d')"
if [ "${DEB_REVISION}" != "1" ]; then
DEB_VERSION="${DEB_VERSION}-${DEB_REVISION}"
fi

5
tools/build-test.sh
View File

@ -39,9 +39,8 @@
run ()
{
echo "Running \"$@\"..."
eval $@
if [ $? -ne 0 ]; then
echo "Running \"$*\"..."
if ! eval "$@"; then
echo "ERROR"
exit 1
fi

13
tools/git-version.sh
View File

@ -47,7 +47,7 @@ case ${VERSION} in
*-*)
# devel/rc version (like 0.4.0-dev or 0.4.0-rc1)
if [ -d "${ROOTDIR}/.git" ]; then
GIT_VERSION=$(cd ${ROOTDIR} && git describe 2>/dev/null)
GIT_VERSION=$(cd "${ROOTDIR}" && git describe 2>/dev/null)
fi
;;
*)
@ -56,19 +56,18 @@ case ${VERSION} in
esac
# check if git version has changed
if [ ! -f ${HEADERFILE} ]; then
if [ ! -f "${HEADERFILE}" ]; then
# header does not exist => create it
echo "Creating file ${HEADERFILE} with git version: \"${GIT_VERSION}\""
echo "#define PACKAGE_VERSION_GIT \"${GIT_VERSION}\"" >${HEADERFILE}
echo "#define PACKAGE_VERSION_GIT \"${GIT_VERSION}\"" >"${HEADERFILE}"
else
grep -q "#define PACKAGE_VERSION_GIT \"${GIT_VERSION}\"" ${HEADERFILE}
if [ $? -eq 0 ]; then
if grep -q "#define PACKAGE_VERSION_GIT \"${GIT_VERSION}\"" "${HEADERFILE}"; then
# git version matches the file => NO update
echo "File ${HEADERFILE} is up-to-date (git version: \"${GIT_VERSION}\")"
else
# git version not found in file => update file with this git version
echo "Updating file ${HEADERFILE} with git version: \"${GIT_VERSION}\""
sed "s/#define PACKAGE_VERSION_GIT \".*\"/#define PACKAGE_VERSION_GIT \"${GIT_VERSION}\"/" ${HEADERFILE} >${HEADERFILE}.tmp
mv -f ${HEADERFILE}.tmp ${HEADERFILE}
sed "s/#define PACKAGE_VERSION_GIT \".*\"/#define PACKAGE_VERSION_GIT \"${GIT_VERSION}\"/" "${HEADERFILE}" >"${HEADERFILE}.tmp"
mv -f "${HEADERFILE}.tmp" "${HEADERFILE}"
fi
fi

8
tools/makedist.sh
View File

@ -41,7 +41,7 @@ if [ -z "${ROOT_DIR}" -o ! -d "${ROOT_DIR}/.git" ]; then
fi
# default values
VERSION="$(${ROOT_DIR}/version.sh devel-full)"
VERSION="$("${ROOT_DIR}/version.sh" devel-full)"
TREEISH="HEAD"
OUTPATH="$(pwd)"
@ -61,10 +61,10 @@ PREFIX="weechat-${VERSION}/"
FILE="${OUTPATH}/weechat-${VERSION}.tar"
echo "Building package ${FILE}.gz"
git archive --prefix=${PREFIX} ${TREEISH} | gzip -c >${FILE}.gz
git archive --prefix="${PREFIX}" "${TREEISH}" | gzip -c >"${FILE}.gz"
echo "Building package ${FILE}.bz2"
git archive --prefix=${PREFIX} ${TREEISH} | bzip2 -c >${FILE}.bz2
git archive --prefix="${PREFIX}" "${TREEISH}" | bzip2 -c >"${FILE}.bz2"
echo "Building package ${FILE}.xz"
git archive --prefix=${PREFIX} ${TREEISH} | xz -c >${FILE}.xz
git archive --prefix="${PREFIX}" "${TREEISH}" | xz -c >"${FILE}.xz"