openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-22 14:44:36 +04:00
Code Issues Packages Projects Releases Wiki Activity

nginx-util: fix issues and cleanup

Browse Source 
* fix regex capture (to conform std)
* fix issues for Clang/libcxx (warnings/includes)
* fix CONFLICTS in the Makefile
* use /bin/sh in host scripts and shellcheck them
* add callback for setting arguments in ubus::call

Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
This commit is contained in:
Peter Stadler
2020-05-26 16:21:10 +02:00
parent 5e6b871e9e
commit 2d359a4556
13 changed files with 421 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
net/nginx-util/src/test-nginx-util.sh
View File

@@ -1,38 +1,48 @@
#!/bin/bash
#!/bin/sh
printf "Initializing tests ...\n"
fakechroot=""
[ -x /usr/bin/fakechroot ] && fakechroot="/usr/bin/fakechroot" \
[ -x "/usr/bin/fakechroot" ] && fakechroot="/usr/bin/fakechroot" \
|| [ "$(id -u)" -eq 0 ] || { \
printf "Error: Testing needs fakechroot or whoami=root for chroot."
return 1
}
TMPROOT=$(mktemp -d /tmp/test-nginx-util-XXXXXX)
TMPROOT="$(mktemp -d "/tmp/test-nginx-util-XXXXXX")"
ln -s /bin ${TMPROOT}/bin
ln -s /bin "${TMPROOT}/bin"
mkdir -p ${TMPROOT}/usr/bin/
mkdir -p "${TMPROOT}/usr/bin/"
cp ./test-nginx-util-root.sh ${TMPROOT}/usr/bin/
cp "./test-nginx-util-root.sh" "${TMPROOT}/usr/bin/"
printf "\n\n******* Testing nginx-ssl-util-noubus *******\n"
cp ./nginx-ssl-util-noubus ${TMPROOT}/usr/bin/nginx-util
cp "./nginx-ssl-util-noubus" "${TMPROOT}/usr/bin/nginx-util"
${fakechroot} /bin/chroot ${TMPROOT} /bin/sh -c /usr/bin/test-nginx-util-root.sh
echo $?
"${fakechroot}" /bin/chroot "${TMPROOT}" \
/bin/sh -c "/usr/bin/test-nginx-util-root.sh" ||
{
echo "!!! Error: $?"
rm -r "${TMPROOT}"
exit 1
}
printf "\n\n******* Testing nginx-ssl-util-nopcre-noubus *******\n"
cp ./nginx-ssl-util-nopcre-noubus ${TMPROOT}/usr/bin/nginx-util
cp "./nginx-ssl-util-nopcre-noubus" "${TMPROOT}/usr/bin/nginx-util"
${fakechroot} /bin/chroot ${TMPROOT} /bin/sh -c /usr/bin/test-nginx-util-root.sh
"${fakechroot}" /bin/chroot "${TMPROOT}" \
/bin/sh -c "/usr/bin/test-nginx-util-root.sh" ||
{
echo "!!! Error: $?"
rm -r "${TMPROOT}"
exit 1
}
rm -r ${TMPROOT}
rm -r "${TMPROOT}"