diff --git a/build/buildandro b/build/buildandro index f251431..e3a3037 100755 --- a/build/buildandro +++ b/build/buildandro @@ -1,25 +1,26 @@ #!/bin/bash # Written by Sean Donovan (swordrune10) #setup build -$LOCAL/config/romeditor +export REPOFOLDER=$( echo "$REPOS/$SCRIPT_REPO-$REPO_PLATFORM" ) +export BUILDFOLDER=$( echo "$BUILDS/$SCRIPT_REPO-$REPO_PLATFORM" ) +export DOTREPO=$( echo "$REPOFOLDER/.repo" ) -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 "$REPOS/$SCRIPT_REPO-$REPO_PLATFORM/out/target/product/$SCRIPT_DEVICE") + outfolder=$(echo "$REPOFOLDER/out/target/product/$SCRIPT_DEVICE") - $rmbuildprop - $rmoldzip + rm -f $outfolder/system/build.prop + rm -f $outfolder/*.zip* - cd $REPOS/$SCRIPT_REPO-$REPO_PLATFORM + cd $REPOFOLDER fi . build/envsetup.sh @@ -71,7 +72,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 +121,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 +142,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/menu/reposync b/menu/reposync index 406c895..23f2569 100755 --- a/menu/reposync +++ b/menu/reposync @@ -110,235 +110,130 @@ if [ ! "$test" == "" ]; then fi fi -if [ $version == "1" ] || [ $version == "9" ]; then +synccode() { +export REPOFOLDER=$( echo "$REPOS/$SCRIPT_REPO-$REPO_PLATFORM" ) +export DOTREPO=$( echo "$REPOFOLDER/.repo" ) +if ( find $DOTREPO &> /dev/null); then echo "" - echo "Updating the Kitchen app repository.." - cd $LOCAL/.. - - repo sync -j$THREADS_TOTAL - echo "" - echo "Kitchen Update Complete!" + echo "Updating $repo_name repository.." + cd $REPOFOLDER - if [ ! $AUTO ]; then - read -p "Press Enter to continue: " done - 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 - 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 + $LOCAL/config/gitpuller - preupdate - repo sync -j$supersync + postupdate - $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.. " + 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 == "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.. " +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 == "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 - - $LOCAL/config/gitpuller - - postupdate - - echo "" - echo "Solana/Targa/Spyder Dev Team Update Complete!" +if [ $version == "1" ] || [ $version == "9" ]; then + echo "" + echo "Updating the Kitchen app repository.." + cd $LOCAL/.. - if [ ! $AUTO ]; then - read -p "Press Enter to continue: " done - fi - else - echo "" - echo "Solana/Targa/Spyder Dev Team not initialized, aborting.. " + repo sync -j$THREADS_TOTAL + echo "" + echo "Kitchen 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.. " - - if [ ! $AUTO ]; then - read -p "Press Enter to continue: " done - fi - fi +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 if [ $version == "10" ]; then 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