Run shell scripts with -e (Closes: #1035)

Make sudo, init prebuild, build and Prepare fields lists and only
concatenate them with '; ' before execution. This allows arbitrary
commands inside the fileds (even && and ';') as we don't need to split
the commands again for rewritemeta.

tests/metadata/dump/com.politedroid.yaml

@@ -144,7 +144,8 @@ Builds:
   srclibs: []
   subdir: null
   submodules: false
-  sudo: echo 'this is just a test'
+  sudo:
+  - echo 'this is just a test'
   target: null
   timeout: null
   versionCode: 6

tests/metadata/dump/org.adaway.yaml

@@ -281,7 +281,8 @@ Builds:
   output: null
   patch: []
   preassemble: []
-  prebuild: android update project -p ../com_actionbarsherlock
+  prebuild:
+  - android update project -p ../com_actionbarsherlock
   rm: []
   scandelete: []
   scanignore: []
@@ -316,7 +317,8 @@ Builds:
   output: null
   patch: []
   preassemble: []
-  prebuild: android update project -p ../com_actionbarsherlock
+  prebuild:
+  - android update project -p ../com_actionbarsherlock
   rm: []
   scandelete: []
   scanignore: []
@@ -351,7 +353,8 @@ Builds:
   output: null
   patch: []
   preassemble: []
-  prebuild: android update project -p ../com_actionbarsherlock
+  prebuild:
+  - android update project -p ../com_actionbarsherlock
   rm: []
   scandelete: []
   scanignore: []
@@ -386,7 +389,8 @@ Builds:
   output: null
   patch: []
   preassemble: []
-  prebuild: android update project -p ../com_actionbarsherlock
+  prebuild:
+  - android update project -p ../com_actionbarsherlock
   rm: []
   scandelete: []
   scanignore: []
@@ -421,7 +425,9 @@ Builds:
   output: null
   patch: []
   preassemble: []
-  prebuild: android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/*
+  prebuild:
+  - android update project -p ../com_actionbarsherlock
+  - rm -rf libs/armeabi/*
   rm: []
   scandelete: []
   scanignore: []
@@ -455,8 +461,10 @@ Builds:
   output: null
   patch: []
   preassemble: []
-  prebuild: android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/*
-    && rm libs/android-support-v4.jar
+  prebuild:
+  - android update project -p ../com_actionbarsherlock
+  - rm -rf libs/armeabi/*
+  - rm libs/android-support-v4.jar
   rm: []
   scandelete: []
   scanignore: []
@@ -490,7 +498,9 @@ Builds:
   output: null
   patch: []
   preassemble: []
-  prebuild: android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/*
+  prebuild:
+  - android update project -p ../com_actionbarsherlock
+  - rm -rf libs/armeabi/*
   rm: []
   scandelete: []
   scanignore: []
@@ -524,8 +534,10 @@ Builds:
   output: null
   patch: []
   preassemble: []
-  prebuild: android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/*
-    && android update project -p ../org_donations
+  prebuild:
+  - android update project -p ../com_actionbarsherlock
+  - rm -rf libs/armeabi/*
+  - android update project -p ../org_donations
   rm: []
   scandelete: []
   scanignore: []
@@ -559,8 +571,10 @@ Builds:
   output: null
   patch: []
   preassemble: []
-  prebuild: android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/*
-    && android update project -p ../org_donations
+  prebuild:
+  - android update project -p ../com_actionbarsherlock
+  - rm -rf libs/armeabi/*
+  - android update project -p ../org_donations
   rm: []
   scandelete: []
   scanignore: []
@@ -594,8 +608,10 @@ Builds:
   output: null
   patch: []
   preassemble: []
-  prebuild: android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/*
-    && android update project -p ../org_donations
+  prebuild:
+  - android update project -p ../com_actionbarsherlock
+  - rm -rf libs/armeabi/*
+  - android update project -p ../org_donations
   rm: []
   scandelete: []
   scanignore: []
@@ -629,8 +645,10 @@ Builds:
   output: null
   patch: []
   preassemble: []
-  prebuild: android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/*
-    && android update project -p ../org_donations
+  prebuild:
+  - android update project -p ../com_actionbarsherlock
+  - rm -rf libs/armeabi/*
+  - android update project -p ../org_donations
   rm: []
   scandelete: []
   scanignore: []
@@ -662,8 +680,9 @@ Builds:
   forceversion: false
   gradle: []
   gradleprops: []
-  init: rm android-libs/Donations/custom_rules.xml && git clone https://github.com/dschuermann/HtmlSpanner
-    android-libs/HtmlSpanner
+  init:
+  - rm android-libs/Donations/custom_rules.xml
+  - git clone https://github.com/dschuermann/HtmlSpanner android-libs/HtmlSpanner
   maven: false
   ndk: null
   novcheck: false
@@ -671,12 +690,13 @@ Builds:
   output: null
   patch: []
   preassemble: []
-  prebuild: rm -rf ../update_zip libs/root-commands-1.2.jar libs/htmlspanner-0.2-fork.jar
-    && cp -f libs/htmlcleaner-2.2.jar android-libs/HtmlSpanner/htmlspanner/libs/ &&
-    echo "android.library.reference.3=$$RootCommands$$" >> project.properties && echo
-    "android.library.reference.4=android-libs/HtmlSpanner/htmlspanner" >> project.properties
-    && find . -type f -print0 | xargs -0 sed -i 's/org.rootcommands/org.sufficientlysecure.rootcommands/g'
-    && cp android-libs/Donations/ant-templates/other/DonationsConfig.java android-libs/Donations/src/org/donations/
+  prebuild:
+  - rm -rf ../update_zip libs/root-commands-1.2.jar libs/htmlspanner-0.2-fork.jar
+  - cp -f libs/htmlcleaner-2.2.jar android-libs/HtmlSpanner/htmlspanner/libs/
+  - echo "android.library.reference.3=$$RootCommands$$" >> project.properties
+  - echo "android.library.reference.4=android-libs/HtmlSpanner/htmlspanner" >> project.properties
+  - find . -type f -print0 | xargs -0 sed -i 's/org.rootcommands/org.sufficientlysecure.rootcommands/g'
+  - cp android-libs/Donations/ant-templates/other/DonationsConfig.java android-libs/Donations/src/org/donations/
   rm: []
   scandelete: []
   scanignore: []
@@ -709,8 +729,9 @@ Builds:
   forceversion: false
   gradle: []
   gradleprops: []
-  init: rm android-libs/Donations/custom_rules.xml && git clone https://github.com/dschuermann/HtmlSpanner
-    android-libs/HtmlSpanner
+  init:
+  - rm android-libs/Donations/custom_rules.xml
+  - git clone https://github.com/dschuermann/HtmlSpanner android-libs/HtmlSpanner
   maven: false
   ndk: null
   novcheck: false
@@ -718,12 +739,13 @@ Builds:
   output: null
   patch: []
   preassemble: []
-  prebuild: rm -rf ../update_zip libs/root-commands-1.2.jar libs/htmlspanner-0.2-fork.jar
-    && cp -f libs/htmlcleaner-2.2.jar android-libs/HtmlSpanner/htmlspanner/libs/ &&
-    echo "android.library.reference.3=$$RootCommands$$" >> project.properties && echo
-    "android.library.reference.4=android-libs/HtmlSpanner/htmlspanner" >> project.properties
-    && find . -type f -print0 | xargs -0 sed -i 's/org.rootcommands/org.sufficientlysecure.rootcommands/g'
-    && cp android-libs/Donations/ant-templates/other/DonationsConfig.java android-libs/Donations/src/org/donations/
+  prebuild:
+  - rm -rf ../update_zip libs/root-commands-1.2.jar libs/htmlspanner-0.2-fork.jar
+  - cp -f libs/htmlcleaner-2.2.jar android-libs/HtmlSpanner/htmlspanner/libs/
+  - echo "android.library.reference.3=$$RootCommands$$" >> project.properties
+  - echo "android.library.reference.4=android-libs/HtmlSpanner/htmlspanner" >> project.properties
+  - find . -type f -print0 | xargs -0 sed -i 's/org.rootcommands/org.sufficientlysecure.rootcommands/g'
+  - cp android-libs/Donations/ant-templates/other/DonationsConfig.java android-libs/Donations/src/org/donations/
   rm: []
   scandelete: []
   scanignore: []

tests/metadata/dump/org.smssecure.smssecure.yaml

@@ -32,13 +32,27 @@ Builds:
   output: null
   patch: []
   preassemble: []
-  prebuild: touch signing.properties && pushd $$GradleWitness$$ && gradle jar && popd
-    && cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar &&
-    sed -i -e '20,22d' build.gradle && pushd $$PreferenceFragment$$ && gradle uploadArchives
-    && popd && sed -i -e '/5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad/d'
-    build.gradle && mkdir smil && pushd smil && wget -c http://www.w3.org/TR/smil-boston-dom/java-binding.zip
-    && unzip java-binding.zip && popd && cp -fR smil/java/org src/ && rm -fR smil
-    && sed -i -e '/org.w3c.smil/d' build.gradle && cp -fR $$AospMms$$/src/org src/
+  prebuild:
+  - touch signing.properties
+  - pushd $$GradleWitness$$
+  - gradle jar
+  - popd
+  - cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar
+  - sed -i -e '20,22d' build.gradle
+  - pushd $$PreferenceFragment$$
+  - gradle uploadArchives
+  - popd
+  - sed -i -e '/5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad/d'
+    build.gradle
+  - mkdir smil
+  - pushd smil
+  - wget -c http://www.w3.org/TR/smil-boston-dom/java-binding.zip
+  - unzip java-binding.zip
+  - popd
+  - cp -fR smil/java/org src/
+  - rm -fR smil
+  - sed -i -e '/org.w3c.smil/d' build.gradle
+  - cp -fR $$AospMms$$/src/org src/
   rm:
   - libs/*
   scandelete: []
@@ -78,8 +92,12 @@ Builds:
   output: null
   patch: []
   preassemble: []
-  prebuild: touch signing.properties && pushd $$GradleWitness$$ && gradle jar && popd
-    && cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar
+  prebuild:
+  - touch signing.properties
+  - pushd $$GradleWitness$$
+  - gradle jar
+  - popd
+  - cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar
   rm:
   - libs/*.jar
   scandelete: []
@@ -116,8 +134,11 @@ Builds:
   output: null
   patch: []
   preassemble: []
-  prebuild: touch signing.properties && ./build-witness.sh && rm -rf libs/gradle-witness/build
-    && echo "org.gradle.jvmargs=-Xms512m -Xmx512m -XX:MaxPermSize=512m" >> gradle.properties
+  prebuild:
+  - touch signing.properties
+  - ./build-witness.sh
+  - rm -rf libs/gradle-witness/build
+  - echo "org.gradle.jvmargs=-Xms512m -Xmx512m -XX:MaxPermSize=512m" >> gradle.properties
   rm:
   - libs/*.jar
   scandelete: []
@@ -153,8 +174,11 @@ Builds:
   output: null
   patch: []
   preassemble: []
-  prebuild: touch signing.properties && ./build-witness.sh && rm -rf libs/gradle-witness/build
-    && echo "org.gradle.jvmargs=-Xms512m -Xmx512m -XX:MaxPermSize=512m" >> gradle.properties
+  prebuild:
+  - touch signing.properties
+  - ./build-witness.sh
+  - rm -rf libs/gradle-witness/build
+  - echo "org.gradle.jvmargs=-Xms512m -Xmx512m -XX:MaxPermSize=512m" >> gradle.properties
   rm:
   - libs/*.jar
   scandelete: []
@@ -190,7 +214,10 @@ Builds:
   output: null
   patch: []
   preassemble: []
-  prebuild: touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build
+  prebuild:
+  - touch signing.properties
+  - ./scripts/build-witness.sh
+  - rm -rf libs/gradle-witness/build
   rm:
   - libs/*.jar
   scandelete: []
@@ -226,7 +253,10 @@ Builds:
   output: null
   patch: []
   preassemble: []
-  prebuild: touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build
+  prebuild:
+  - touch signing.properties
+  - ./scripts/build-witness.sh
+  - rm -rf libs/gradle-witness/build
   rm:
   - libs/*.jar
   scandelete: []
@@ -262,7 +292,10 @@ Builds:
   output: null
   patch: []
   preassemble: []
-  prebuild: touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build
+  prebuild:
+  - touch signing.properties
+  - ./scripts/build-witness.sh
+  - rm -rf libs/gradle-witness/build
   rm:
   - libs/*.jar
   scandelete: []
@@ -298,7 +331,10 @@ Builds:
   output: null
   patch: []
   preassemble: []
-  prebuild: touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build
+  prebuild:
+  - touch signing.properties
+  - ./scripts/build-witness.sh
+  - rm -rf libs/gradle-witness/build
   rm:
   - libs/*.jar
   scandelete: []