diff --git a/metadata/a2dp.Vol.txt b/metadata/a2dp.Vol.txt
index 98cabc0c50..10dc57157f 100644
--- a/metadata/a2dp.Vol.txt
+++ b/metadata/a2dp.Vol.txt
@@ -118,7 +118,7 @@ Build:2.12.9.1,136
     patch=gradle.patch
     gradle=yes
     prebuild=sed -i -e '/buildToolsVersion/s/23.0.2/25.0.0/g' -e '/support-v4/s/21.0.3/25.0.1/g' -e '/compileSdkVersion/s/19/24/g' -e '/targetSdkVersion/s/19/25/g' build.gradle && \
-        sed -i -e '/<!-- ATTENTION:/,+4d' -e 's@</application>@</service></application>@g' src/main/AndroidManifest.xml 
+        sed -i -e '/<!-- ATTENTION:/,+4d' -e 's@</application>@</service></application>@g' src/main/AndroidManifest.xml
 
 Build:2.12.9.2,137
     commit=aed734d5ff231b7d6462a6fe0f8ac40c45593bd9
diff --git a/metadata/com.amaze.filemanager.txt b/metadata/com.amaze.filemanager.txt
index 34c7672616..25bb230bf1 100644
--- a/metadata/com.amaze.filemanager.txt
+++ b/metadata/com.amaze.filemanager.txt
@@ -142,7 +142,7 @@ Build:3.1.0 Beta 2,43
     rm=libs/RootTools.jar,libs/ftp*.jar
     prebuild=cp -fR $$RootTools$$/RootTools/src/main/java/com src/main/java/ && \
         sed -i -e '/playCompile/d' -e '/Properties/,$d' build.gradle && \
-        pushd $$ftplet$$  && \
+        pushd $$ftplet$$ && \
         $$MVN3$$ package -DskipTests=true && \
         popd && \
         cp $$ftplet$$/core/target/ftpserver-core-1.1.0-SNAPSHOT.jar $$ftplet$$/ftplet-api/target/ftplet-api-1.1.0-SNAPSHOT.jar libs/
@@ -154,7 +154,7 @@ Build:3.1.1,44
     rm=libs/RootTools.jar,libs/ftp*.jar
     prebuild=cp -fR $$RootTools$$/RootTools/src/main/java/com src/main/java/ && \
         sed -i -e '/playCompile/d' -e '/Properties/,$d' build.gradle && \
-        pushd $$ftplet$$  && \
+        pushd $$ftplet$$ && \
         $$MVN3$$ package -DskipTests=true && \
         popd && \
         cp $$ftplet$$/core/target/ftpserver-core-1.1.0-SNAPSHOT.jar $$ftplet$$/ftplet-api/target/ftplet-api-1.1.0-SNAPSHOT.jar libs/
diff --git a/metadata/com.fastaccess.github.txt b/metadata/com.fastaccess.github.txt
index 74270ae14b..b48dcf5f42 100644
--- a/metadata/com.fastaccess.github.txt
+++ b/metadata/com.fastaccess.github.txt
@@ -80,19 +80,19 @@ Build:1.8.2,182
     commit=1.8.2
     subdir=app
     gradle=fdroid
-    prebuild=sed -i -e '/com.google.gms/d' -e '/com.google.firebase/d' ../build.gradle build.gradle 
+    prebuild=sed -i -e '/com.google.gms/d' -e '/com.google.firebase/d' ../build.gradle build.gradle
 
 Build:1.9.1,191
     commit=1.9.1
     subdir=app
     gradle=fdroid
-    prebuild=sed -i -e '/com.google.gms/d' -e '/com.google.firebase/d' ../build.gradle build.gradle 
+    prebuild=sed -i -e '/com.google.gms/d' -e '/com.google.firebase/d' ../build.gradle build.gradle
 
 Build:1.9.2,192
     commit=1.9.2
     subdir=app
     gradle=fdroid
-    prebuild=sed -i -e '/com.google.gms/d' -e '/com.google.firebase/d' ../build.gradle build.gradle 
+    prebuild=sed -i -e '/com.google.gms/d' -e '/com.google.firebase/d' ../build.gradle build.gradle
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags
diff --git a/metadata/com.ilm.sandwich.txt b/metadata/com.ilm.sandwich.txt
index 5d7626ddb8..a7cb909d23 100644
--- a/metadata/com.ilm.sandwich.txt
+++ b/metadata/com.ilm.sandwich.txt
@@ -32,28 +32,28 @@ Build:2.1.2f,28
     commit=2.1.2f
     subdir=smartnaviapp
     gradle=free
-    prebuild=sed -i -e '/fabric/d' build.gradle ../build.gradle  && \
+    prebuild=sed -i -e '/fabric/d' build.gradle ../build.gradle && \
         sed -i -e '/dependencies/a/*' -e '/appcompat-v7/i*/'  build.gradle
 
 Build:2.2.1f,33
     commit=2.2.1f
     subdir=smartnaviapp
     gradle=free
-    prebuild=sed -i -e '/fabric/d' build.gradle ../build.gradle  && \
+    prebuild=sed -i -e '/fabric/d' build.gradle ../build.gradle && \
         sed -i -e '/dependencies/a/*' -e '/appcompat-v7/i*/' -e 's@http://guardian.github.com/maven/repo-releases@https://jitpack.io@g' -e '/com.gu:option/d' -e '/support-v4/acompile "com.github.guardian:Option:e933c3a31d"' build.gradle
 
 Build:2.2.2f,34
     commit=2.2.2f
     subdir=smartnaviapp
     gradle=free
-    prebuild=sed -i -e '/fabric/d' build.gradle ../build.gradle  && \
+    prebuild=sed -i -e '/fabric/d' build.gradle ../build.gradle && \
         sed -i -e '/dependencies/a/*' -e '/appcompat-v7/i*/' -e 's@http://guardian.github.com/maven/repo-releases@https://jitpack.io@g' -e '/com.gu:option/d' -e '/support-v4/acompile "com.github.guardian:Option:e933c3a31d"' build.gradle
 
 Build:2.2.4f,35
     commit=2.2.4f
     subdir=smartnaviapp
     gradle=free
-    prebuild=sed -i -e '/fabric/d' build.gradle ../build.gradle  && \
+    prebuild=sed -i -e '/fabric/d' build.gradle ../build.gradle && \
         sed -i -e '/dependencies/a/*' -e '/appcompat-v7/i*/' -e 's@http://guardian.github.com/maven/repo-releases@https://jitpack.io@g' -e '/com.gu:option/d' -e '/support-v4/acompile "com.github.guardian:Option:e933c3a31d"' build.gradle
 
 Build:2.3.2,39
@@ -61,7 +61,7 @@ Build:2.3.2,39
     commit=2.3.2
     subdir=smartnaviapp
     gradle=free
-    prebuild=sed -i -e '/fabric/d' -e '/google-service/d' build.gradle ../build.gradle  && \
+    prebuild=sed -i -e '/fabric/d' -e '/google-service/d' build.gradle ../build.gradle && \
         sed -i -e '/dependencies/a/*' -e '/appcompat-v7/i*/' -e 's@http://guardian.github.com/maven/repo-releases@https://jitpack.io@g' -e '/com.gu:option/d' -e '/support-v4/acompile "com.github.guardian:Option:e933c3a31d"' build.gradle
 
 Auto Update Mode:None
diff --git a/metadata/it.sasabz.android.sasabus.txt b/metadata/it.sasabz.android.sasabus.txt
index 654abf04c2..322a9e29ac 100644
--- a/metadata/it.sasabz.android.sasabus.txt
+++ b/metadata/it.sasabz.android.sasabus.txt
@@ -61,7 +61,7 @@ Build:2.1.0-beta1,51
     commit=ad9c4af67d399f66753450ef055fe3d26c7ea47e
     subdir=app
     gradle=fdroid
-    prebuild=sed -i -e '/playStoreCompile/d' -e 's|https://maven.fabric.io/public|https://jitpack.io|g' build.gradle  && \
+    prebuild=sed -i -e '/playStoreCompile/d' -e 's|https://maven.fabric.io/public|https://jitpack.io|g' build.gradle && \
         sed -i -e '/fabric/d' -e '/google-services/d' ../build.gradle build.gradle && \
         sed -i -e '/com.crashlytics.sdk.android/,+2d' build.gradle && \
         sed -i -e 's|@integer/google_play_services_version|0|g' src/main/AndroidManifest.xml src/fdroid/AndroidManifest.xml
diff --git a/metadata/net.somethingdreadful.MAL.txt b/metadata/net.somethingdreadful.MAL.txt
index c47bab473a..635eeea2ea 100644
--- a/metadata/net.somethingdreadful.MAL.txt
+++ b/metadata/net.somethingdreadful.MAL.txt
@@ -51,7 +51,7 @@ Build:2.3.6,38
     commit=2.3.6
     subdir=Atarashii
     gradle=FLOSSProduction
-    prebuild=sed -i -e '/com.crashlytics.sdk.android/d' -e '1,/apply from/d' -e '/repositories {/,+2d'  build.gradle  && \
+    prebuild=sed -i -e '/com.crashlytics.sdk.android/d' -e '1,/apply from/d' -e '/repositories {/,+2d'  build.gradle && \
         sed -i -e '/fabric/d' -e '1iapply from: "local.gradle"' build.gradle && \
         mv local.gradle.sample local.gradle && \
         echo -e "android { lintOptions { disable 'MissingTranslation'\n\ndisable 'ExtraTranslation' } }" >> build.gradle
diff --git a/metadata/org.fossasia.openevent.txt b/metadata/org.fossasia.openevent.txt
index 2ce84c7ae3..57245629c5 100644
--- a/metadata/org.fossasia.openevent.txt
+++ b/metadata/org.fossasia.openevent.txt
@@ -28,7 +28,7 @@ Build:1.0.1,101
     subdir=android/app
     gradle=fdroid
     prebuild=sed -i -e '/googleplayCompile/d' build.gradle && \
-        sed -i -e 's/<!--//g' -e 's/-->//g'  src/main/res/menu/drawer.xml 
+        sed -i -e 's/<!--//g' -e 's/-->//g'  src/main/res/menu/drawer.xml
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest/development
diff --git a/metadata/org.gnu.icecat.txt b/metadata/org.gnu.icecat.txt
index 7942273112..5ccd66c6bb 100644
--- a/metadata/org.gnu.icecat.txt
+++ b/metadata/org.gnu.icecat.txt
@@ -28,7 +28,7 @@ Build:38.6.0,380600
     srclibs=MozLocales@96b78c77,IceCat@d75da834
     prebuild=fxarch=arm-linux-androideabi && \
         bash $$IceCat$$/makeicecat --skip-compare-locales --skip-l10n --no-debian --no-tarball --with-sourcedir=$PWD && \
-        bash $$MozLocales$$/prebuild-icecat.sh  && \
+        bash $$MozLocales$$/prebuild-icecat.sh && \
         echo "ac_add_options --with-android-ndk=$$NDK$$" >> .mozconfig && \
         echo "ac_add_options --with-android-sdk=$$SDK$$/platforms/android-22" >> .mozconfig && \
         echo "ac_add_options --target=${fxarch}" >> .mozconfig && \
@@ -46,7 +46,7 @@ Build:38.7.1,380701
     srclibs=MozLocales@96b78c77,IceCat@f6c6629a
     prebuild=fxarch=`echo $$VERCODE$$ | cut -c 5 | sed -e 's/0/arm-linux-androideabi/g' -e 's/1/i386-linux-androideabi/g'` && \
         bash $$IceCat$$/makeicecat --skip-compare-locales --skip-l10n --no-debian --no-tarball --with-sourcedir=$PWD && \
-        bash $$MozLocales$$/prebuild-icecat.sh  && \
+        bash $$MozLocales$$/prebuild-icecat.sh && \
         echo "ac_add_options --with-android-ndk=$$NDK$$" >> .mozconfig && \
         echo "ac_add_options --with-android-sdk=$$SDK$$/platforms/android-22" >> .mozconfig && \
         echo "ac_add_options --target=${fxarch}" >> .mozconfig && \
@@ -64,7 +64,7 @@ Build:38.7.1,380711
     srclibs=MozLocales@96b78c77,IceCat@f6c6629a
     prebuild=fxarch=`echo $$VERCODE$$ | cut -c 5 | sed -e 's/0/arm-linux-androideabi/g' -e 's/1/i386-linux-androideabi/g'` && \
         bash $$IceCat$$/makeicecat --skip-compare-locales --skip-l10n --no-debian --no-tarball --with-sourcedir=$PWD && \
-        bash $$MozLocales$$/prebuild-icecat.sh  && \
+        bash $$MozLocales$$/prebuild-icecat.sh && \
         echo "ac_add_options --with-android-ndk=$$NDK$$" >> .mozconfig && \
         echo "ac_add_options --with-android-sdk=$$SDK$$/platforms/android-22" >> .mozconfig && \
         echo "ac_add_options --target=${fxarch}" >> .mozconfig && \
@@ -82,7 +82,7 @@ Build:38.8.0,380800
     srclibs=MozLocales@96b78c77,IceCat@d3384a83
     prebuild=fxarch=`echo $$VERCODE$$ | cut -c 5 | sed -e 's/0/arm-linux-androideabi/g' -e 's/1/i386-linux-androideabi/g'` && \
         bash $$IceCat$$/makeicecat --skip-compare-locales --skip-l10n --no-debian --no-tarball --with-sourcedir=$PWD && \
-        bash $$MozLocales$$/prebuild-icecat.sh  && \
+        bash $$MozLocales$$/prebuild-icecat.sh && \
         echo "ac_add_options --with-android-ndk=$$NDK$$" >> .mozconfig && \
         echo "ac_add_options --with-android-sdk=$$SDK$$/platforms/android-22" >> .mozconfig && \
         echo "ac_add_options --target=${fxarch}" >> .mozconfig && \
@@ -100,7 +100,7 @@ Build:38.8.0,380810
     srclibs=MozLocales@96b78c77,IceCat@d3384a83
     prebuild=fxarch=`echo $$VERCODE$$ | cut -c 5 | sed -e 's/0/arm-linux-androideabi/g' -e 's/1/i386-linux-androideabi/g'` && \
         bash $$IceCat$$/makeicecat --skip-compare-locales --skip-l10n --no-debian --no-tarball --with-sourcedir=$PWD && \
-        bash $$MozLocales$$/prebuild-icecat.sh  && \
+        bash $$MozLocales$$/prebuild-icecat.sh && \
         echo "ac_add_options --with-android-ndk=$$NDK$$" >> .mozconfig && \
         echo "ac_add_options --with-android-sdk=$$SDK$$/platforms/android-22" >> .mozconfig && \
         echo "ac_add_options --target=${fxarch}" >> .mozconfig && \
diff --git a/metadata/org.libresignal.txt b/metadata/org.libresignal.txt
index a368f215b4..ae1d0de0c5 100644
--- a/metadata/org.libresignal.txt
+++ b/metadata/org.libresignal.txt
@@ -32,7 +32,7 @@ Build:3.14.2,190
     commit=444c0db79b1bd91736479a9a0b4a33f961563399
     submodules=yes
     gradle=yes
-    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation' } }" >> build.gradle  && \
+    prebuild=echo -e "android { lintOptions { disable 'MissingTranslation' } }" >> build.gradle && \
         sed -i -e '/dexOptions {/,+2d' build.gradle
 
 Build:3.15.1,192
diff --git a/metadata/org.videolan.vlc.txt b/metadata/org.videolan.vlc.txt
index 61e853bc7d..66b2db87ca 100644
--- a/metadata/org.videolan.vlc.txt
+++ b/metadata/org.videolan.vlc.txt
@@ -1183,7 +1183,7 @@ Build:2.0.6,12000605
     srclibs=VLC@6689dcb
     prebuild=ln -s vlc-android/$$VLC$$ ../vlc && \
         sed -i -e '/sdk-manager/d' ../build.gradle && \
-        wget -c https://downloads.videolan.org/pub/contrib/jpeg/jpegsrc.v9a.tar.gz -O ../vlc/contrib/tarballs/jpegsrc.v9a.tar.gz  && \
+        wget -c https://downloads.videolan.org/pub/contrib/jpeg/jpegsrc.v9a.tar.gz -O ../vlc/contrib/tarballs/jpegsrc.v9a.tar.gz && \
         echo "3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7  jpegsrc.v9a.tar.gz" > ../vlc/contrib/tarballs/jpegsrc.v9a.tar.gz.sha256 && \
         cd ../vlc/contrib/tarballs/ && \
         sha256sum -c jpegsrc.v9a.tar.gz.sha256