Some adjustments for install deps failures

fdroid/build.sh

@@ -1,4 +1,12 @@
 #!/bin/bash
+## build.sh
+##
+## @author csagan5
+##
+## Bromite build script for F-Droid
+## https://www.bromite.org/
+##
+#
 
 if [ ! $# -eq 5 ]; then
 	echo "Usage: build.sh release version-code arch ninja-target" 1>&2
@@ -14,8 +22,7 @@ OUTPUT="out/Release_${RELEASE}_${ARCH}"
 
 set -e
 
-## sync starts in fdroiddata/build/$PKG
-echo "BUILD from $PWD"
+## build= commands run in fdroiddata/build/$PKG
 
 . common
 
@@ -45,5 +52,12 @@ gn gen "--args=android_default_version_code=\"${VER_CODE}\" android_default_vers
 CONC=$(nproc)
 let CONC+=1
 
+PREFIX=""
+## detect running buildserver
+## if running locally, then reduce build process priority
+if [ ! -e $HOME/buildserverid ]; then
+	PREFIX="ionice --class 3 nice --adjustment=5"
+fi
+
 ##NOTE: can't use exit code to identify interrupts until https://github.com/ninja-build/ninja/issues/430 is addressed
-NINJA_STATUS="%f/%t (%p) %es | " ionice --class 3 nice --adjustment=5 ninja -j$CONC -C "$OUTPUT" ${NINJA_TARGET}
+NINJA_STATUS="%f/%t (%p) %es | " $PREFIX ninja -j$CONC -C "$OUTPUT" ${NINJA_TARGET}

fdroid/common

@@ -1,3 +1,6 @@
+###
+### common include script for sync and build
+###
 
 ## rename main repo & restore it on exit
 mv ../../srclib/chromium ../../srclib/src

fdroid/gclient-prepare.sh

@@ -1,9 +1,16 @@
 #!/bin/bash
 ## gclient-prepare.sh
+##
+## @author csagan5
+##
+## Bromite srclibs setup script for F-Droid build
 ## this script is auto-generated based on gclient_entries
 ## DO NOT edit manually
 ##
+## https://www.bromite.org/
+##
 #
+
 set -e
 
 ## setup chromium-py into src/third_party/webdriver/pylib

fdroid/install-deps.sh

@@ -1,4 +1,12 @@
 #!/bin/bash
+## install-deps.sh
+##
+## @author csagan5
+##
+## Bromite dependencies setup script for F-Droid
+## https://www.bromite.org/
+##
+#
 
 if [ ! $# -eq 1 ]; then
 	echo "Usage: install-deps.sh release" 1>&2
@@ -7,8 +15,7 @@ fi
 
 RELEASE="$1"
 
-## sudo starts in fdroiddata/
-echo "SUDO from $PWD"
+## sudo= commands run in fdroiddata/
 
 set -e
 
@@ -17,4 +24,17 @@ cd build/srclib/chromium
 
 git checkout "$RELEASE"
 
+## remove some deps that fail due to jessie-backports
+#for DEP in libcups2-dev libdrm-dev libgl1-mesa-dev libgles2-mesa-dev libglib2.0-dev libpulse-dev libssl-dev libudev-dev; do
+#	sed -i "s~^  $DEP\$~~" build/install-build-deps.sh
+#done
+
+## to fix the "E: no packages found" error
+apt-get update
+
+## accept the license for the MS core fonts - installed by Chromium's install deps script
+echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections
+## do not ask questions during installations - always assume yes
+echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
+
 exec build/install-build-deps-android.sh

fdroid/sync.sh

@@ -1,9 +1,16 @@
 #!/bin/bash
+## sync.sh
+##
+## @author csagan5
+##
+## Bromite 'gclient sync' script for F-Droid
+## https://www.bromite.org/
+##
+#
 
 set -e
 
-## sync starts in fdroiddata/build/$PKG
-echo "SYNC from $PWD"
+## sync= commands run in fdroiddata/build/$PKG
 
 . common
 
@@ -23,11 +30,9 @@ set +e
 echo y | gclient sync --reset
 RV=$?
 
-## revert the license workaround
-git checkout DEPS
-cd ..
 
 if [ $RV -eq 0 ]; then
+	cd ..
 	## success, copy the new gclient_entries
 	cp .gclient_entries ../$PKG/fdroid/gclient_entries
 	exit 0