diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index d3a41c43..8d0bc06b 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -89,13 +89,14 @@ export -f scanForMalware; generateBootAnimationMask() { text=$1; - output=$2; - convert -background black -fill transparent -font Fira-Sans-Bold -gravity center -size 512x128 label:"$text" "$output"; + font=$2 + output=$3; + convert -background black -fill transparent -font "$font" -gravity center -size 512x128 label:"$text" "$output"; } export -f generateBootAnimationMask; audit2allowCurrent() { - adb shell dmesg | grep denied | audit2allow -p "$ANDROID_PRODUCT_OUT"/root/sepolicy; + adb shell dmesg | audit2allow -p "$ANDROID_PRODUCT_OUT"/root/sepolicy; } export -f audit2allowCurrent; diff --git a/Scripts/LineageOS-14.1/Rebrand.sh b/Scripts/LineageOS-14.1/Rebrand.sh index 00df1fc4..b8c98061 100644 --- a/Scripts/LineageOS-14.1/Rebrand.sh +++ b/Scripts/LineageOS-14.1/Rebrand.sh @@ -29,7 +29,7 @@ sed -i 's|echo "ro.build.host=`hostname`"|echo "ro.build.host=dosbm"|' tools/bui 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; +generateBootAnimationMask "$REBRAND_NAME" "$REBRAND_BOOTANIMATION_FONT" 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; diff --git a/Scripts/LineageOS-15.1/Rebrand.sh b/Scripts/LineageOS-15.1/Rebrand.sh index 58cd7aa2..f645b011 100644 --- a/Scripts/LineageOS-15.1/Rebrand.sh +++ b/Scripts/LineageOS-15.1/Rebrand.sh @@ -32,7 +32,7 @@ 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 enter "frameworks/base"; -generateBootAnimationMask "$REBRAND_NAME" core/res/assets/images/android-logo-mask.png; +generateBootAnimationMask "$REBRAND_NAME" "$REBRAND_BOOTANIMATION_FONT" 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; diff --git a/Scripts/init.sh b/Scripts/init.sh index 5bad340c..40be7fd2 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -35,6 +35,7 @@ export NON_COMMERCIAL_USE_PATCHES=false; #Switch to false to prevent inclusion o export REBRAND_NAME="DivestOS"; export REBRAND_ZIP_PREFIX="divested"; +export REBRAND_BOOTANIMATION_FONT="Fira-Sans-Bold"; #Options: $ convert -list font export REBRAND_LEGAL="https://divestos.xyz/index.php?page=privacy_policy"; #END OF USER CONFIGURABLE OPTIONS