aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrubo77 <github@r.z11.de>2018-07-24 00:10:46 +0200
committerrubo77 <github@r.z11.de>2018-07-24 00:10:46 +0200
commit59cd0122381836f68e849a4a0ff227fc0b564b82 (patch)
tree20fad5aa9a8e832b0b39464b646177969c0abd6b
parent9d47d776357f7d50671503edad334ecfb78e0e10 (diff)
validate.sh: possibility to define packages repo too
-rwxr-xr-xtests/validate_site.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/validate_site.sh b/tests/validate_site.sh
index 361eb29..8138842 100755
--- a/tests/validate_site.sh
+++ b/tests/validate_site.sh
@@ -3,6 +3,7 @@
# 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_REPO="https://github.com/freifunk-gluon/packages"
GLUON_PACKAGES_BRANCH='master'
P=$(pwd)
@@ -56,8 +57,8 @@ for feed in $GLUON_SITE_FEEDS; do
cd -
done
-echo "####### downloading github.com/freifunk-gluon/packages ..."
-git clone -b $GLUON_PACKAGES_BRANCH --depth 1 --single-branch https://github.com/freifunk-gluon/packages
+echo "####### downloading $GLUON_PACKAGES_REPO ..."
+git clone -b $GLUON_PACKAGES_BRANCH --depth 1 --single-branch $GLUON_PACKAGES_REPO
echo "####### downloading gluon ..."
cd $testpath
@@ -72,7 +73,7 @@ cd $testpath/packages/package
echo "####### validating GLUON_SITE_PACKAGES from $P/site.mk ..."
# ignore non-gluon packages and standard gluon features
-sed '/GLUON_RELEASE/,$d' $P/site.mk | egrep -v '(#|G|iwinfo|iptables|haveged|vim|socat|mesh-batman-adv-1[45]|web-advanced|web-wizard)'> $testpath/site.mk.sh
+sed '/GLUON_RELEASE/,$d' $P/site.mk | egrep -v '(#|G|iwinfo|iptables|haveged|vim|socat|tar|mesh-batman-adv-1[45]|web-advanced|web-wizard)'> $testpath/site.mk.sh
sed -i 's/\s\\$//g;/^$/d' $testpath/site.mk.sh
sed -i 's/gluon-mesh-batman-adv-1[45]/gluon-mesh-batman-adv/g' $testpath/site.mk.sh
cat $testpath/site.mk.sh |