diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index f20ec5d3..d3a41c43 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -87,6 +87,13 @@ scanForMalware() { } export -f scanForMalware; +generateBootAnimationMask() { + text=$1; + output=$2; + convert -background black -fill transparent -font Fira-Sans-Bold -gravity center -size 512x128 label:"$text" "$output"; +} +export -f generateBootAnimationMask; + audit2allowCurrent() { adb shell dmesg | grep denied | audit2allow -p "$ANDROID_PRODUCT_OUT"/root/sepolicy; } @@ -221,6 +228,11 @@ changeDefaultDNS() { dnsPrimaryV6="2620:fe::fe"; dnsSecondary="149.112.112.112"; dnsSecondaryV6="2620:fe::10"; #not real secondary, primary "unsecured" + elif [[ "$DEFAULT_DNS_PRESET" == "Verisign" ]]; then + dnsPrimary="64.6.64.6"; + dnsPrimaryV6="2620:74:1b::1:1"; + dnsSecondary="64.6.65.6"; + dnsSecondaryV6="2620:74:1c::2:2"; fi; else echo "You must first set a preset via the DEFAULT_DNS_PRESET variable in init.sh!"; diff --git a/Scripts/LineageOS-14.1/Rebrand.sh b/Scripts/LineageOS-14.1/Rebrand.sh index 4fd3880d..00df1fc4 100644 --- a/Scripts/LineageOS-14.1/Rebrand.sh +++ b/Scripts/LineageOS-14.1/Rebrand.sh @@ -28,6 +28,9 @@ sed -i 's|echo "ro.build.user=$USER"|echo "ro.build.user=emy"|' tools/buildinfo. sed -i 's|echo "ro.build.host=`hostname`"|echo "ro.build.host=dosbm"|' tools/buildinfo.sh; #Override build host sed -i '/CM_TARGET_PACKAGE/s/lineage/'"$REBRAND_ZIP_PREFIX"'/' core/Makefile; +enter "frameworks/base"; +generateBootAnimationMask "$REBRAND_NAME" core/res/assets/images/android-logo-mask.png; + enter "packages/apps/Settings"; sed -i '/.*cmlicense_title/s/LineageOS/'"$REBRAND_NAME"'/' res/values*/cm_strings.xml; sed -i '/.*cmupdate_settings_title/s/LineageOS/'"$REBRAND_NAME"'/' res/values*/cm_strings.xml; @@ -45,7 +48,7 @@ sed -i 's|>LineageOS|>'"$REBRAND_NAME"'|' res/values*/strings.xml; enter "vendor/cm"; sed -i 's|https://lineageos.org/legal|'"$REBRAND_LEGAL"'|' config/common.mk; sed -i '/.*ZIPPATH=/s/lineage/'"$REBRAND_ZIP_PREFIX"'/' build/envsetup.sh; -rm -rf bootanimation #TODO: Create a boot animation +rm -rf bootanimation; cd "$base"; echo "Rebranding complete!"; diff --git a/Scripts/LineageOS-15.1/Rebrand.sh b/Scripts/LineageOS-15.1/Rebrand.sh index e07ea37c..58cd7aa2 100644 --- a/Scripts/LineageOS-15.1/Rebrand.sh +++ b/Scripts/LineageOS-15.1/Rebrand.sh @@ -31,6 +31,9 @@ enter "build/make"; sed -i 's|echo "ro.build.user=$USER"|echo "ro.build.user=emy"|' tools/buildinfo.sh; #Override build user sed -i 's|echo "ro.build.host=`hostname`"|echo "ro.build.host=dosbm"|' tools/buildinfo.sh; #Override build host +enter "frameworks/base"; +generateBootAnimationMask "$REBRAND_NAME" core/res/assets/images/android-logo-mask.png; + enter "lineage-sdk"; sed -i '/.*lineage_version/s/LineageOS/'"$REBRAND_NAME"'/' lineage/res/res/values*/strings.xml; sed -i '/.*lineage_updates/s/LineageOS/'"$REBRAND_NAME"'/' lineage/res/res/values*/strings.xml; @@ -55,7 +58,7 @@ enter "vendor/lineage"; sed -i 's|https://lineageos.org/legal|'"$REBRAND_LEGAL"'|' build/core/main_version.mk sed -i '/.*ZIPPATH=/s/lineage/'"$REBRAND_ZIP_PREFIX"'/' build/envsetup.sh; sed -i '/LINEAGE_TARGET_PACKAGE/s/lineage/'"$REBRAND_ZIP_PREFIX"'/' build/tasks/bacon.mk; -rm -rf bootanimation; #TODO: Create a boot animation +rm -rf bootanimation; cd "$base"; echo "Rebranding complete!"; diff --git a/Scripts/init.sh b/Scripts/init.sh index 39f2f14f..5bad340c 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -23,7 +23,7 @@ export androidWorkspace="/mnt/Drive-3/"; #XXX: THIS MUST BE CORRECT TO BUILD! export DEBLOBBER_REMOVE_AUDIOFX=false; #Set true to remove AudioFX export DEBLOBBER_REMOVE_IMS=false; #Set true to remove all IMS blobs export DEBLOBBER_REPLACE_TIME=false; #Set true to replace Qualcomm Time Services with the open source Sony TimeKeep reimplementation -export DEFAULT_DNS_PRESET="OpenNIC"; #Sets default DNS. Options: Cloudflare, OpenNIC, DNSWATCH, Google, OpenDNS, Quad9 +export DEFAULT_DNS_PRESET="OpenNIC"; #Sets default DNS. Options: Cloudflare, OpenNIC, DNSWATCH, Google, OpenDNS, Quad9, Verisign export GLONASS_FORCED_ENABLE=true; #Enables GLONASS on all devices export MALWARE_SCAN_ENABLED=true; #Set true to perform a fast scan on patchWorkspace() and a through scan on buildAll() export MALWARE_SCAN_SETTING="quick"; #buildAll() scan speed. Options: quick, extra, slow, full diff --git a/TODO b/TODO index 14d7ce94..46ca314e 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,4 @@ -Last updated: 2018-06-12 +Last updated: 2018-06-24 High Priority (Release blockers) Build @@ -28,7 +28,7 @@ Medium Priority Design - Facelift of Extirpater - Facelift of Hypatia - - Various other branding (bootanimation, setupwizard, etc.) + - Various other branding (proper bootanimation, setupwizard, etc.) Project - Create various XMPP conference rooms Servers