Refactor pre-build test scripts to work with upcomming build scripts

This commit is contained in:
Conrad Lara - KG6JEI 2015-04-30 10:41:04 -07:00
parent b920402b1f
commit 741bb65e4b
4 changed files with 8 additions and 36 deletions

View File

@ -33,8 +33,7 @@
LICENSE
PWD=$(pwd)
SCRIPTBASE=$(dirname "$(readlink -f "$0")")
export SCRIPTBASE=$(dirname "$(readlink -f "$0")")
if [ "$1" != "" ]
then
@ -43,17 +42,19 @@ else
AREDNFILESBASE="$PWD/files"
fi
if [ ! -d "$AREDNFILESBASE" ]
then
echo "ERROR: $AREDNFILESBASE doesn't exist"
exit 1;
fi
export AREDNFILESBASE
for file in $SCRIPTBASE/tests/prebuild/*
do
if [ -x "$file" ]; then
$file "$AREDNFILESBASE"
$file
fi
done

View File

@ -33,18 +33,7 @@
LICENSE
SCRIPTBASE=$(dirname "$(readlink -f "$0")")
. "$SCRIPTBASE/../../sh2ju.sh"
AREDNFILESBASE=$1
if [ ! -d "$AREDNFILESBASE" ]
then
echo "ERROR: Please provide the files base path"
exit 1;
fi
. "$SCRIPTBASE/sh2ju.sh"
for file in "$AREDNFILESBASE"/www/cgi-bin/*
do

View File

@ -33,17 +33,7 @@
LICENSE
SCRIPTBASE=$(dirname "$(readlink -f "$0")")
. "$SCRIPTBASE/../../sh2ju.sh"
AREDNFILESBASE=$1
if [ ! -d "$AREDNFILESBASE" ]
then
echo "ERROR: Please provide the files base path"
exit 1;
fi
. "$SCRIPTBASE/sh2ju.sh"
for file in "$AREDNFILESBASE"/usr/local/bin/*
do

View File

@ -33,16 +33,8 @@
LICENSE
SCRIPTBASE=$(dirname "$(readlink -f "$0")")
. "$SCRIPTBASE/../../sh2ju.sh"
. "$SCRIPTBASE/sh2ju.sh"
AREDNFILESBASE=$1
if [ ! -d "$AREDNFILESBASE" ]
then
echo "ERROR: Please provide the files base path"
exit 1;
fi
# Make sure shellchheck is installed and in path.
juLog -name="usrlocalbinshell_shellcheckexists" which shellcheck