echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tests: Fix some bashisms, add more files to bashisms check

Browse Source
This commit is contained in:
zzz
2019-06-09 15:50:50 +00:00
parent 0c54b6d9da
commit 6d9aa92ed0
3 changed files with 24 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/c/jbigi/mbuild-all.sh
View File

@ -84,7 +84,7 @@ if [ ! -f "$JAVA_HOME/include/jni.h" ]; then
exit 1 exit 1
fi fi
if ! command -v m4 > /dev/null; then if ! command m4 > /dev/null; then
printf "\aWARNING: \`m4\` not found. Install m4 " >&2 printf "\aWARNING: \`m4\` not found. Install m4 " >&2
printf "and re-run this script.\n\n\n\a" >&2 printf "and re-run this script.\n\n\n\a" >&2
exit 1 exit 1
@ -140,7 +140,7 @@ else
exit 1 exit 1
fi fi
if ! command -v ${CC} > /dev/null; then if ! command ${CC} > /dev/null; then
echo "The compiler you've selected \"$CC\" does not appear to exist" echo "The compiler you've selected \"$CC\" does not appear to exist"
exit 1 exit 1
fi fi

8
tests/scripts/checkremotecerts.sh
View File

@ -123,16 +123,16 @@ check_hosts() {
OLDIFS=$IFS OLDIFS=$IFS
IFS=":" IFS=":"
set -- $HOST set -- $HOST
HOSTNAME=$1 HOSTNAM=$1
PORT=$2 PORT=$2
IFS=$OLDIFS IFS=$OLDIFS
else else
HOSTNAME=$HOST HOSTNAM=$HOST
PORT=443 PORT=443
fi fi
echo -n "Checking $HOSTNAME:$PORT..." echo -n "Checking $HOSTNAM:$PORT..."
if retry connect "$HOSTNAME" "$PORT" < /dev/null 1> "$WORK/$HOST"; then if retry connect "$HOSTNAM" "$PORT" < /dev/null 1> "$WORK/$HOST"; then
# OpenSSL returns "return code: 0 (ok)" # OpenSSL returns "return code: 0 (ok)"
# GnuTLS returns "certificate is trusted" # GnuTLS returns "certificate is trusted"

44
tests/scripts/checkscripts.sh
View File

@ -13,45 +13,37 @@ SCRIPTFILES="\
./apps/desktopgui/bundle-messages.sh \ ./apps/desktopgui/bundle-messages.sh \
./apps/i2psnark/java/bundle-messages.sh \ ./apps/i2psnark/java/bundle-messages.sh \
./apps/i2psnark/launch-i2psnark \ ./apps/i2psnark/launch-i2psnark \
./apps/i2ptunnel/java/bundle-messages-proxy.sh \ ./apps/i2ptunnel/java/bundle-messages*.sh \
./apps/i2ptunnel/java/bundle-messages.sh \ ./apps/ministreaming/java/bundle-messages.sh \
./apps/routerconsole/java/bundle-messages-news.sh \ ./apps/routerconsole/java/bundle-messages*.sh \
./apps/routerconsole/java/bundle-messages.sh \
./apps/sam/c/examples/i2p-ping/pinger.sh \ ./apps/sam/c/examples/i2p-ping/pinger.sh \
./apps/susidns/src/bundle-messages.sh \ ./apps/susidns/src/bundle-messages.sh \
./apps/susimail/bundle-messages.sh \ ./apps/susimail/bundle-messages.sh \
./core/c/build.sh \ ./core/c/*.sh \
./core/c/jbigi/build-all.sh \ ./core/c/jbigi/*.sh \
./core/c/jbigi/build_jbigi.sh \ ./debian/*.config \
./core/c/jbigi/build.sh \ ./debian/*.init \
./core/c/jbigi/mbuild-all.sh \ ./debian/*.preinst \
./core/c/jcpuid/build.sh \ ./debian/*.postinst \
./core/c/mbuild.sh \ ./debian/*.postrm \
./debian/i2p.config \ ./Docker.entrypoint.sh
./debian/i2p-doc.preinst \ ./installer/resources/*.sh \
./debian/i2p.init \ ./installer/resources/eepget \
./debian/i2p.postinst \ ./installer/resources/i2prouter \
./debian/i2p.postrm \
./debian/i2p.preinst \
./debian/libjbigi-jni.preinst \
./debian/repack.sh \
./installer/resources/install_i2p_service_osx.command \ ./installer/resources/install_i2p_service_osx.command \
./installer/resources/install_i2p_service_unix \ ./installer/resources/install_i2p_service_unix \
./installer/resources/locale/bundle-messages.sh \ ./installer/resources/locale/bundle-messages.sh \
./installer/resources/postinstall.sh \
./installer/resources/runplain.sh \
./installer/resources/uninstall_i2p_service_osx.command ./installer/resources/uninstall_i2p_service_osx.command
./installer/resources/uninstall_i2p_service_unix \ ./installer/resources/uninstall_i2p_service_unix \
./launchers/macosx/check_latest_java.sh \
./launchers/macosx/download_and_build_sparkle.sh \
./Slackware/i2p/i2p.SlackBuild \ ./Slackware/i2p/i2p.SlackBuild \
./Slackware/i2p/doinst.sh \ ./Slackware/i2p/doinst.sh \
./Slackware/i2p/rc.i2p \ ./Slackware/i2p/rc.i2p \
./tests/scripts/checkcerts.sh \ ./tests/scripts/*.sh \
./tests/scripts/checkpo.sh \
./tests/scripts/checkutf8.sh \
./tests/scripts/checkxml.sh \
./tests/scripts/testjbigi.sh \
" "
echo "Checking scripts for bashisms ..."
for script in $SCRIPTFILES; do for script in $SCRIPTFILES; do
#echo "Checking $script ..." #echo "Checking $script ..."
if sh -n "$script" ; then : ; else if sh -n "$script" ; then : ; else