Skip to content
Snippets Groups Projects
Commit b8fbcaeb authored by Jan-Tarek Butt's avatar Jan-Tarek Butt
Browse files

build.sh: break by branch fault

parent 54b23489
No related branches found
No related tags found
No related merge requests found
...@@ -9,7 +9,7 @@ GLUON_VERSION="$2" ...@@ -9,7 +9,7 @@ GLUON_VERSION="$2"
#check installed debendenciece #check installed debendenciece
if [ -f /etc/debian_version ]; then if [ -f /etc/debian_version ]; then
echo "Checking for git..." echo "Checking for git..."
if ! command -v git 2&> /dev/null; then if ! command -v git > /dev/null 2>&1; then
echo "git is not installed" echo "git is not installed"
exit 1 exit 1
fi fi
...@@ -73,9 +73,11 @@ ls -A | grep -v -E '(^|\s)site($|\s)' | xargs -I{} mv {} site/ ...@@ -73,9 +73,11 @@ ls -A | grep -v -E '(^|\s)site($|\s)' | xargs -I{} mv {} site/
# Clone Gluon repo # Clone Gluon repo
git init . git init .
git remote add origin https://github.com/freifunk-gluon/gluon.git git remote add origin https://github.com/freifunk-gluon/gluon.git
git pull origin $GLUON_VERSION git pull origin "$GLUON_VERSION"
cd site && sh prepare.sh && cd .. cd site || exit 1
sh prepare.sh || exit 1
cd ..
# fetch packages repos and apply patches # fetch packages repos and apply patches
make update || exit 1 make update || exit 1
...@@ -90,9 +92,9 @@ while read line; do ...@@ -90,9 +92,9 @@ while read line; do
targ=$(echo $line | sed -e 's/^.*GluonTarget//' -e 's/^,//' -e 's/)).*//' -e 's/[,]/-/') targ=$(echo $line | sed -e 's/^.*GluonTarget//' -e 's/^,//' -e 's/)).*//' -e 's/[,]/-/')
#Build arcitecture images #Build arcitecture images
make -j $((CPUS*2)) GLUON_TARGET=$targ BROKEN=1 GLUON_BRANCH=$GLUON_BRANCH || exit 1 make -j $((CPUS*2)) GLUON_TARGET="$targ" BROKEN=1 GLUON_BRANCH="$GLUON_BRANCH" || exit 1
fi; fi;
done < "targets/targets.mk" done < "targets/targets.mk"
# create manifest file for autoupdater # create manifest file for autoupdater
make manifest GLUON_BRANCH=$GLUON_BRANCH make manifest GLUON_BRANCH="$GLUON_BRANCH"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment