From 5255471eff6c223e7936b283650b41f01ca23b75 Mon Sep 17 00:00:00 2001 From: Sean Donovan Date: Thu, 21 Jun 2012 04:39:24 -0500 Subject: [PATCH 1/7] user repofolder and buildfolder where applicable --- build/buildandro | 20 ++++++++++---------- headerfile | 4 ++++ update/preupdate | 45 ++++++++++++++++++++++++++++----------------- 3 files changed, 42 insertions(+), 27 deletions(-) diff --git a/build/buildandro b/build/buildandro index f251431..3577691 100755 --- a/build/buildandro +++ b/build/buildandro @@ -14,12 +14,12 @@ if [ ! "$OTHER_REPO_FOLDER" == "" ]; then cd $OTHER_REPO_FOLDER else - outfolder=$(echo "$REPOS/$SCRIPT_REPO-$REPO_PLATFORM/out/target/product/$SCRIPT_DEVICE") + outfolder=$(echo "$REPOFOLDER/out/target/product/$SCRIPT_DEVICE") $rmbuildprop $rmoldzip - cd $REPOS/$SCRIPT_REPO-$REPO_PLATFORM + cd $REPOFOLDER fi . build/envsetup.sh @@ -71,7 +71,7 @@ if [ ! "$OTHER_REPO_FOLDER" == "" ]; then "Build zip is located in $OTHER_REPO_FOLDER/out/target/product/$SCRIPT_DEVICE" exit 0 else - cd $REPOS/$SCRIPT_REPO-$REPO_PLATFORM/out/target/product/$SCRIPT_DEVICE + cd $REPOFOLDER/out/target/product/$SCRIPT_DEVICE fi if [ $SCRIPT_REPO == "cm" ] || [ $SCRIPT_REPO == "sts" ]; then @@ -120,20 +120,20 @@ if [ $SCRIPT_REPO == "aosp" ] || [ $SCRIPT_REPO == "rooted-aosp" ]; then java -Xmx1024m -classpath $LOCAL/testsign.jar testsign unsignedcrap.zip $zip fi -mkdir -p $BUILDS/$SCRIPT_REPO-$REPO_PLATFORM/old +mkdir -p $BUILDFOLDER/old -if ( find $BUILDS/$SCRIPT_REPO-$REPO_PLATFORM/*$SCRIPT_DEVICE.zip &> /dev/null); then +if ( find $BUILDFOLDER/*$SCRIPT_DEVICE.zip &> /dev/null); then echo "Moving older build to $BUILDS/$SCRIPT_REPO-$REPO_PLATFORM/old" - mv $BUILDS/$SCRIPT_REPO-$REPO_PLATFORM/*$SCRIPT_DEVICE.zip $BUILDS/$SCRIPT_REPO-$REPO_PLATFORM/old - mv $BUILDS/$SCRIPT_REPO-$REPO_PLATFORM/*$SCRIPT_DEVICE.zip.md5sum $BUILDS/$SCRIPT_REPO-$REPO_PLATFORM/old + mv $BUILDFOLDER/*$SCRIPT_DEVICE.zip $BUILDFOLDER/old + mv $BUILDFOLDER/*$SCRIPT_DEVICE.zip.md5sum $BUILDFOLDER/old fi newzip=$(echo $SCRIPT_REPO-$REPO_PLATFORM-$(date +%Y%m%d)-SWORDKITCHEN-$SCRIPT_DEVICE.zip) -echo "Copying to $BUILDS/$SCRIPT_REPO-$REPO_PLATFORM" +echo "Copying to $BUILDFOLDER" echo "$zip -> $newzip" -cp $zip $BUILDS/$SCRIPT_REPO-$REPO_PLATFORM/$newzip +cp $zip $BUILDFOLDER/$newzip if [ $SCRIPT_REPO == "aosp" ] || [ $SCRIPT_REPO == "rooted-aosp" ]; then echo "Cleaning up temporary folder" @@ -141,6 +141,6 @@ if [ $SCRIPT_REPO == "aosp" ] || [ $SCRIPT_REPO == "rooted-aosp" ]; then rm -r temp fi -cd $BUILDS/$SCRIPT_REPO-$REPO_PLATFORM +cd $BUILDFOLDER md5sum $newzip md5sum $newzip > $newzip.md5sum diff --git a/headerfile b/headerfile index 04fdf88..d588563 100755 --- a/headerfile +++ b/headerfile @@ -15,6 +15,10 @@ fi export BUILDS=$( echo "$REPOS/../builds" ) +export REPOFOLDER=$( echo "$REPOS/\$SCRIPT_REPO-\$REPO_PLATFORM" ) +export BUILDFOLDER=$( echo "$BUILDS/\$SCRIPT_REPO-\$REPO_PLATFORM" ) +export DOTREPO=$( echo "$REPOFOLDER/.repo" ) + if ( find $BUILDS/../publish &> /dev/null); then cd $BUILDS/../publish export PUBLISH=$( pwd ) diff --git a/update/preupdate b/update/preupdate index e107bc6..28779be 100755 --- a/update/preupdate +++ b/update/preupdate @@ -1,14 +1,10 @@ #!/bin/bash # Written by Sean Donovan (swordrune10) -cd $REPOS/$SCRIPT_REPO-ics/.repo -if [ $SCRIPT_REPO == "cm" ]; then +if [ $SCRIPT_REPO == "aokp" ]; then + rm -r vendor/aokp echo "" - echo "Updating Cyanogenmod 9's local_manifest.xml" - if ( ! find $LOCAL/xml/cm-local_manifest.xml &> /dev/null ); then - export AUTHOR="xml" - scriptmakir - fi - cp -f $LOCAL/xml/cm-local_manifest.xml ./local_manifest.xml + echo "Updating Android Open Kang Project's local_manifest.xml" + wget https://raw.github.com/AOKP/platform_manifest/ics/kernel_manifest.xml -O $DOTREPO/local_manifest.xml fi if [ $SCRIPT_REPO == "aosp" ]; then @@ -18,27 +14,42 @@ if [ $SCRIPT_REPO == "aosp" ]; then export AUTHOR="xml" scriptmakir fi - cp -f $LOCAL/xml/aosp-local_manifest.xml ./local_manifest.xml + cp -f $LOCAL/xml/aosp-local_manifest.xml $DOTREPO/local_manifest.xml fi -if [ $SCRIPT_REPO == "rooted-aosp" ]; then +if [ $SCRIPT_REPO == "cm" ]; then + rm -r vendor/cm echo "" - echo "Updating Rooted & Busyboxed's local_manifest.xml" - if ( ! find $LOCAL/xml/rooted-aosp-local_manifest.xml &> /dev/null ); then + echo "Updating Cyanogenmod 9's local_manifest.xml" + if ( ! find $LOCAL/xml/cm-local_manifest.xml &> /dev/null ); then export AUTHOR="xml" scriptmakir fi - cp -f $LOCAL/xml/rooted-aosp-local_manifest.xml ./local_manifest.xml + cp -f $LOCAL/xml/cm-local_manifest.xml $DOTREPO/local_manifest.xml fi -if [ $SCRIPT_REPO == "aokp" ]; then +if [ $SCRIPT_REPO == "evervolv" ]; then + rm -r vendor/ev +fi + +if [ $SCRIPT_REPO == "rooted-aosp" ]; then + rm -r vendor/keyblade echo "" - echo "Updating Android Open Kang Project's local_manifest.xml" - wget https://raw.github.com/AOKP/platform_manifest/ics/kernel_manifest.xml -O ./local_manifest.xml + echo "Updating Rooted & Busyboxed's local_manifest.xml" + if ( ! find $LOCAL/xml/rooted-aosp-local_manifest.xml &> /dev/null ); then + export AUTHOR="xml" + scriptmakir + fi + cp -f $LOCAL/xml/rooted-aosp-local_manifest.xml $DOTREPO/local_manifest.xml fi if [ $SCRIPT_REPO == "sts" ]; then + rm -r vendor/cm echo "" echo "Updating STS Dev Team's local_manifest.xml" - wget https://raw.github.com/STS-Dev-Team/android_local_STS/ics/local_manifest.xml -O ./local_manifest.xml + wget https://raw.github.com/STS-Dev-Team/android_local_STS/ics/local_manifest.xml -O $DOTREPO/local_manifest.xml +fi + +if [ $SCRIPT_REPO == "gummy" ]; then + rm -r vendor/Gummy fi From 3a7cede79cbe799446c842178ee39bcfd3c8be28 Mon Sep 17 00:00:00 2001 From: Sean Donovan Date: Thu, 21 Jun 2012 04:41:56 -0500 Subject: [PATCH 2/7] unify reposync, making it shorter code --- menu/reposync | 307 ++++++++++++++++---------------------------------- 1 file changed, 100 insertions(+), 207 deletions(-) diff --git a/menu/reposync b/menu/reposync index 406c895..1b2fe33 100755 --- a/menu/reposync +++ b/menu/reposync @@ -124,222 +124,115 @@ if [ $version == "1" ] || [ $version == "9" ]; then fi fi -if [ $version == "2" ] || [ $version == "9" ]; then - if ( find $REPOS/aokp-ics/.repo &> /dev/null); then - export SCRIPT_REPO=$(echo "aokp") - echo "" - echo "Updating the Android Open Kang Project repository.." - cd $REPOS/aokp-ics - rm -r vendor/aokp - - preupdate - repo sync -j$supersync - - $LOCAL/config/gitpuller - - postupdate - - echo "" - echo "Android Open Kang Project Update Complete!" - - if [ ! $AUTO ]; then - read -p "Press Enter to continue: " done - fi - else - echo "" - echo "Android Open Kang Project not initialized, aborting.. " - - if [ ! $AUTO ]; then - read -p "Press Enter to continue: " done - fi - fi -fi - -if [ $version == "3" ] || [ $version == "9" ]; then - if ( find $REPOS/aosp-ics/.repo &> /dev/null); then - export SCRIPT_REPO=$(echo "aosp") - echo "" - echo "Updating Android Open Source Project repository.." - cd $REPOS/aosp-ics - - preupdate - repo sync -j$supersync - - $LOCAL/config/gitpuller - - postupdate - - echo "" - echo "Android Open Source Project Update Complete!" - - if [ ! $AUTO ]; then - read -p "Press Enter to continue: " done - fi - else - echo "" - echo "Android Open Source Project not initialized, aborting.. " - - if [ ! $AUTO ]; then - read -p "Press Enter to continue: " done - fi - fi -fi - -if [ $version == "4" ] || [ $version == "9" ]; then - if ( find $REPOS/cm-ics/.repo &> /dev/null); then - export SCRIPT_REPO=$(echo "cm") - echo "" - echo "Updating Cyanogenmod 9 repository.." - cd $REPOS/cm-ics - rm -r vendor/cm - - preupdate - repo sync -j$supersync - - $LOCAL/config/gitpuller - - postupdate - - echo "" - echo "Cyanogenmod 9 Update Complete!" - - if [ ! $AUTO ]; then - read -p "Press Enter to continue: " done - fi - else - echo "" - echo "Cyanogenmod 9 not initialized, aborting.. " - - if [ ! $AUTO ]; then - read -p "Press Enter to continue: " done - fi - fi -fi - - -if [ $version == "5" ] || [ $version == "9" ]; then - if ( find $REPOS/evervolv-ics/.repo &> /dev/null); then - export SCRIPT_REPO=$(echo "evervolv") - echo "" - echo "Updating Evervolv repository.." - cd $REPOS/evervolv-ics - rm -r vendor/ev - - preupdate - repo sync -j$supersync - - $LOCAL/config/gitpuller - - postupdate - - echo "" - echo "Evervolv Update Complete!" - - if [ ! $AUTO ]; then - read -p "Press Enter to continue: " done - fi - else - echo "" - echo "Evervolv not initialized, aborting.. " - - if [ ! $AUTO ]; then - read -p "Press Enter to continue: " done - fi - fi -fi - -if [ $version == "6" ] || [ $version == "9" ]; then - if ( find $REPOS/rooted-aosp-ics/.repo &> /dev/null); then - export SCRIPT_REPO=$(echo "rooted-aosp") - echo "" - echo "Updating Rooted & Busyboxed AOSP repository.." - cd $REPOS/rooted-aosp-ics - rm -r vendor/keyblade - - preupdate - repo sync -j$supersync - - $LOCAL/config/gitpuller - - postupdate - - echo "" - echo "Rooted & Busyboxed AOSP Update Complete!" - - if [ ! $AUTO ]; then - read -p "Press Enter to continue: " done - fi - else - echo "" - echo "Rooted & Busyboxed AOSP not initialized, aborting.. " - - if [ ! $AUTO ]; then - read -p "Press Enter to continue: " done - fi - fi -fi - -if [ $version == "7" ] || [ $version == "9" ]; then - if ( find $REPOS/sts-ics/.repo &> /dev/null); then - export SCRIPT_REPO=$(echo "sts") - echo "" - echo "Updating Solana/Targa/Spyder Dev Team repository.." - cd $REPOS/sts-ics - rm -r vendor/cm - - preupdate - repo sync -j$supersync +if [ $version == "2" ]; then + export SCRIPT_REPO=$(echo "aokp") + export REPO_PLATFORM=$(echo "ics") + repo_name=$(echo "Android Open Kang Project") + synccode +fi + +if [ $version == "3" ]; then + export SCRIPT_REPO=$(echo "aosp") + export REPO_PLATFORM=$(echo "ics") + repo_name=$(echo "Android Open Source Project") + synccode +fi + +if [ $version == "4" ]; then + export SCRIPT_REPO=$(echo "cm") + export REPO_PLATFORM=$(echo "ics") + repo_name=$(echo "Cyanogenmod 9") + synccode +fi + + +if [ $version == "5" ]; then + export SCRIPT_REPO=$(echo "evervolv") + export REPO_PLATFORM=$(echo "ics") + repo_name=$(echo "Evervolv") + synccode +fi + +if [ $version == "6" ]; then + export SCRIPT_REPO=$(echo "rooted-aosp") + export REPO_PLATFORM=$(echo "ics") + repo_name=$(echo "Rooted & Busyboxed AOSP") + synccode +fi + +if [ $version == "7" ]; then + export SCRIPT_REPO=$(echo "sts") + export REPO_PLATFORM=$(echo "ics") + repo_name=$(echo "Solana/Targa/Spyder Dev Team") + synccode +fi + +if [ $version == "8" ]; then + export SCRIPT_REPO=$(echo "gummy") + export REPO_PLATFORM=$(echo "ics") + repo_name=$(echo "Team Gummy") + synccode +fi + +if [ $version == "9" ]; then + export SCRIPT_REPO=$(echo "aokp") + export REPO_PLATFORM=$(echo "ics") + repo_name=$(echo "Android Open Kang Project") + synccode + export SCRIPT_REPO=$(echo "aosp") + export REPO_PLATFORM=$(echo "ics") + repo_name=$(echo "Android Open Source Project") + synccode + export SCRIPT_REPO=$(echo "cm") + export REPO_PLATFORM=$(echo "ics") + repo_name=$(echo "Cyanogenmod 9") + synccode + export SCRIPT_REPO=$(echo "evervolv") + export REPO_PLATFORM=$(echo "ics") + repo_name=$(echo "Evervolv") + synccode + export SCRIPT_REPO=$(echo "rooted-aosp") + export REPO_PLATFORM=$(echo "ics") + repo_name=$(echo "Rooted & Busyboxed AOSP") + synccode + export SCRIPT_REPO=$(echo "sts") + export REPO_PLATFORM=$(echo "ics") + repo_name=$(echo "Solana/Targa/Spyder Dev Team") + synccode + export SCRIPT_REPO=$(echo "gummy") + export REPO_PLATFORM=$(echo "ics") + repo_name=$(echo "Team Gummy") + synccode +fi + +synccode() { +if ( find $DOTREPO &> /dev/null); then + echo "" + echo "Updating $repo_name repository.." + cd $REPOFOLDER - $LOCAL/config/gitpuller + preupdate + repo sync -j$supersync - postupdate + $LOCAL/config/gitpuller - echo "" - echo "Solana/Targa/Spyder Dev Team Update Complete!" + postupdate - if [ ! $AUTO ]; then - read -p "Press Enter to continue: " done - fi - else - echo "" - echo "Solana/Targa/Spyder Dev Team not initialized, aborting.. " + echo "" + echo "$repo_name Update Complete!" - if [ ! $AUTO ]; then - read -p "Press Enter to continue: " done - fi + if [ ! $AUTO ]; then + read -p "Press Enter to continue: " done fi -fi - -if [ $version == "8" ] || [ $version == "9" ]; then - if ( find $REPOS/gummy-ics/.repo &> /dev/null); then - export SCRIPT_REPO=$(echo "gummy") - echo "" - echo "Updating Team Gummy repository.." - cd $REPOS/gummy-ics - rm -r vendor/Gummy - - preupdate - repo sync -j$supersync - - $LOCAL/config/gitpuller - - postupdate - - echo "" - echo "Team Gummy Update Complete!" - - if [ ! $AUTO ]; then - read -p "Press Enter to continue: " done - fi - else - echo "" - echo "Team Gummy not initialized, aborting.. " +else + echo "" + echo "$repo_name not initialized, aborting.. " - if [ ! $AUTO ]; then - read -p "Press Enter to continue: " done - fi + if [ ! $AUTO ]; then + read -p "Press Enter to continue: " done fi fi +} if [ $version == "10" ]; then echo "" From 7727da54ce24ceda11aced8f088f3b14f7970b09 Mon Sep 17 00:00:00 2001 From: Sean Donovan Date: Thu, 21 Jun 2012 05:15:48 -0500 Subject: [PATCH 3/7] reposync: move synccode to a better place --- menu/reposync | 58 +++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/menu/reposync b/menu/reposync index 1b2fe33..2242351 100755 --- a/menu/reposync +++ b/menu/reposync @@ -110,6 +110,35 @@ if [ ! "$test" == "" ]; then fi fi +synccode() { +if ( find $DOTREPO &> /dev/null); then + echo "" + echo "Updating $repo_name repository.." + cd $REPOFOLDER + + preupdate + repo sync -j$supersync + + $LOCAL/config/gitpuller + + postupdate + + echo "" + echo "$repo_name Update Complete!" + + if [ ! $AUTO ]; then + read -p "Press Enter to continue: " done + fi +else + echo "" + echo "$repo_name not initialized, aborting.. " + + if [ ! $AUTO ]; then + read -p "Press Enter to continue: " done + fi +fi +} + if [ $version == "1" ] || [ $version == "9" ]; then echo "" echo "Updating the Kitchen app repository.." @@ -205,35 +234,6 @@ if [ $version == "9" ]; then synccode fi -synccode() { -if ( find $DOTREPO &> /dev/null); then - echo "" - echo "Updating $repo_name repository.." - cd $REPOFOLDER - - preupdate - repo sync -j$supersync - - $LOCAL/config/gitpuller - - postupdate - - echo "" - echo "$repo_name Update Complete!" - - if [ ! $AUTO ]; then - read -p "Press Enter to continue: " done - fi -else - echo "" - echo "$repo_name not initialized, aborting.. " - - if [ ! $AUTO ]; then - read -p "Press Enter to continue: " done - fi -fi -} - if [ $version == "10" ]; then echo "" read -p "Returning to Main Menu, Press Enter to continue: " done From c62d8780b7104752f0f9ee1070d45e1058afd734 Mon Sep 17 00:00:00 2001 From: Sean Donovan Date: Thu, 21 Jun 2012 05:19:38 -0500 Subject: [PATCH 4/7] headerfile: make dotrepo not yet mapped out --- headerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/headerfile b/headerfile index d588563..1d6e1b1 100755 --- a/headerfile +++ b/headerfile @@ -17,7 +17,7 @@ export BUILDS=$( echo "$REPOS/../builds" ) export REPOFOLDER=$( echo "$REPOS/\$SCRIPT_REPO-\$REPO_PLATFORM" ) export BUILDFOLDER=$( echo "$BUILDS/\$SCRIPT_REPO-\$REPO_PLATFORM" ) -export DOTREPO=$( echo "$REPOFOLDER/.repo" ) +export DOTREPO=$( echo "\$REPOFOLDER/.repo" ) if ( find $BUILDS/../publish &> /dev/null); then cd $BUILDS/../publish From 5415aba5654da4b474c082925469fd912890c051 Mon Sep 17 00:00:00 2001 From: Sean Donovan Date: Thu, 21 Jun 2012 05:44:34 -0500 Subject: [PATCH 5/7] headerfile: attempt getting var not initialized to work --- headerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/headerfile b/headerfile index 1d6e1b1..6688e2a 100755 --- a/headerfile +++ b/headerfile @@ -15,9 +15,9 @@ fi export BUILDS=$( echo "$REPOS/../builds" ) -export REPOFOLDER=$( echo "$REPOS/\$SCRIPT_REPO-\$REPO_PLATFORM" ) -export BUILDFOLDER=$( echo "$BUILDS/\$SCRIPT_REPO-\$REPO_PLATFORM" ) -export DOTREPO=$( echo "\$REPOFOLDER/.repo" ) +export REPOFOLDER=$( echo "$REPOS/$SCRIPT_REPO-$REPO_PLATFORM" ) +export BUILDFOLDER=$( echo "$BUILDS/$SCRIPT_REPO-$REPO_PLATFORM" ) +export DOTREPO=$( echo "$REPOFOLDER/.repo" ) if ( find $BUILDS/../publish &> /dev/null); then cd $BUILDS/../publish From 645e8bac7bd7df35d4afa7aedce0b636fee6df07 Mon Sep 17 00:00:00 2001 From: Sean Donovan Date: Thu, 21 Jun 2012 05:57:36 -0500 Subject: [PATCH 6/7] move dotrepo, buildfolder, and repofolder out of headerfile apparently its near impossible to use a variable not in existence yet guess i should of figured that one huh? --- build/buildandro | 3 +++ headerfile | 4 ---- menu/reposync | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build/buildandro b/build/buildandro index 3577691..650133c 100755 --- a/build/buildandro +++ b/build/buildandro @@ -1,6 +1,9 @@ #!/bin/bash # Written by Sean Donovan (swordrune10) #setup build +export REPOFOLDER=$( echo "$REPOS/$SCRIPT_REPO-$REPO_PLATFORM" ) +export BUILDFOLDER=$( echo "$BUILDS/$SCRIPT_REPO-$REPO_PLATFORM" ) +export DOTREPO=$( echo "$REPOFOLDER/.repo" ) $LOCAL/config/romeditor rmbuildprop=$(echo "rm -f \$outfolder/system/build.prop") diff --git a/headerfile b/headerfile index 6688e2a..04fdf88 100755 --- a/headerfile +++ b/headerfile @@ -15,10 +15,6 @@ fi export BUILDS=$( echo "$REPOS/../builds" ) -export REPOFOLDER=$( echo "$REPOS/$SCRIPT_REPO-$REPO_PLATFORM" ) -export BUILDFOLDER=$( echo "$BUILDS/$SCRIPT_REPO-$REPO_PLATFORM" ) -export DOTREPO=$( echo "$REPOFOLDER/.repo" ) - if ( find $BUILDS/../publish &> /dev/null); then cd $BUILDS/../publish export PUBLISH=$( pwd ) diff --git a/menu/reposync b/menu/reposync index 2242351..23f2569 100755 --- a/menu/reposync +++ b/menu/reposync @@ -111,6 +111,8 @@ if [ ! "$test" == "" ]; then fi synccode() { +export REPOFOLDER=$( echo "$REPOS/$SCRIPT_REPO-$REPO_PLATFORM" ) +export DOTREPO=$( echo "$REPOFOLDER/.repo" ) if ( find $DOTREPO &> /dev/null); then echo "" echo "Updating $repo_name repository.." From 4791ea4a7fdac0659746fe5e83ae9ae971065fd2 Mon Sep 17 00:00:00 2001 From: Sean Donovan Date: Thu, 21 Jun 2012 06:05:39 -0500 Subject: [PATCH 7/7] buildandro: fix remove stuff at start of build --- build/buildandro | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/build/buildandro b/build/buildandro index 650133c..e3a3037 100755 --- a/build/buildandro +++ b/build/buildandro @@ -4,23 +4,21 @@ export REPOFOLDER=$( echo "$REPOS/$SCRIPT_REPO-$REPO_PLATFORM" ) export BUILDFOLDER=$( echo "$BUILDS/$SCRIPT_REPO-$REPO_PLATFORM" ) export DOTREPO=$( echo "$REPOFOLDER/.repo" ) -$LOCAL/config/romeditor -rmbuildprop=$(echo "rm -f \$outfolder/system/build.prop") -rmoldzip=$(echo "rm -f \$outfolder/*.zip*") +$LOCAL/config/romeditor if [ ! "$OTHER_REPO_FOLDER" == "" ]; then outfolder=$(echo "$OTHER_REPO_FOLDER/out/target/product/$SCRIPT_DEVICE") - $rmbuildprop - $rmoldzip + rm -f $outfolder/system/build.prop + rm -f $outfolder/*.zip* cd $OTHER_REPO_FOLDER else outfolder=$(echo "$REPOFOLDER/out/target/product/$SCRIPT_DEVICE") - $rmbuildprop - $rmoldzip + rm -f $outfolder/system/build.prop + rm -f $outfolder/*.zip* cd $REPOFOLDER fi