aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorrubo77 <github@r.z11.de>2018-07-11 22:48:04 +0200
committerrubo77 <github@r.z11.de>2018-07-12 02:29:15 +0200
commit292f8673bf62d19883f30bf72cb3e6fb4763144b (patch)
tree107085584897b95241e0184dede01a341bcce597 /tests
parentebeab61591564200bf58d5a4e0143f6e7262bc39 (diff)
validate.sh better explained output and introduce GLUON_REPO
Diffstat (limited to 'tests')
-rwxr-xr-xtests/validate_site.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/validate_site.sh b/tests/validate_site.sh
index 381993d..7230558 100755
--- a/tests/validate_site.sh
+++ b/tests/validate_site.sh
@@ -1,6 +1,7 @@
#!/bin/bash
# validate_site.sh checks if the site.conf is valid json
+GLUON_REPO="https://github.com/freifunk-gluon/gluon"
GLUON_BRANCH='v2018.1.x'
GLUON_PACKAGES_BRANCH='master'
@@ -48,11 +49,11 @@ done
echo "####### downloading github.com/freifunk-gluon/packages ..."
git clone -b $GLUON_PACKAGES_BRANCH --single-branch https://github.com/freifunk-gluon/packages
-echo "####### downloading github.com/freifunk-gluon/gluon ..."
+echo "####### downloading gluon ..."
cd $testpath
git init gluon
cd gluon
-git remote add origin https://github.com/freifunk-gluon/gluon
+git remote add origin $GLUON_REPO
git config core.sparsecheckout true
echo "package/*" >> .git/info/sparse-checkout
git pull --depth=1 origin $GLUON_BRANCH
@@ -70,12 +71,12 @@ while read packet; do
echo -n "# $packet"
FOUND="$(find $testpath/packages/ -type d -name "$packet")"
if [ "$FOUND" '!=' '' ]; then
- echo " from $(echo $FOUND|sed 's|'$testpath'/packages||g')"
+ echo " found as feature in $(echo $FOUND|sed 's|'$testpath'/packages||g')"
else
# check again with prefix gluon-
FOUND="$(find $testpath/packages/ -type d -name "gluon-$packet")"
if [ "$FOUND" '!=' '' ]; then
- echo " from $(echo $FOUND|sed 's|'$testpath'/packages||g')"
+ echo " found in $(echo $FOUND|sed 's|'$testpath'/packages||g')"
else
echo
echo "ERROR: $packet missing"