parent
ec703f1db9
commit
391b4ffbb0
@ -1,66 +0,0 @@
|
||||
user_conf() {
|
||||
|
||||
for dir in "$(dirname "$0")" "$(dirname "$zipfile")" "$moddir" "/data/adb"; do
|
||||
[ -f "$dir/includelist.txt" ] || [ -f "$dir/excludelist.txt" ] && {
|
||||
ui_print " ";
|
||||
if [ -f "$dir/includelist.txt" ]; then
|
||||
ui_print "Processing include config from $dir...";
|
||||
includelist="$(sed -e 's|\#.*||g' -e 's|[^a-zA-Z0-9.-]| |g' "$dir/includelist.txt")";
|
||||
else
|
||||
ui_print "Processing exclude config from $dir...";
|
||||
excludelist="$(sed -e 's|\#.*||g' -e 's|[^a-zA-Z0-9.-]| |g' "$dir/excludelist.txt")";
|
||||
fi;
|
||||
break;
|
||||
}
|
||||
done;
|
||||
|
||||
[ "$includelist" ] && {
|
||||
new_stuff="";
|
||||
new_stuff_arch="";
|
||||
new_stuff_sdk="";
|
||||
new_stuff_arch_sdk="";
|
||||
for include in $includelist; do
|
||||
log "Including keyword $include";
|
||||
new_stuff="$new_stuff $(echo "$stuff" | grep -oi "[ ]*[^ ]*$include[^ ]*[ ]*")";
|
||||
new_stuff_arch="$new_stuff_arch $(echo "$stuff_arch" | grep -oi "[ ]*[^ ]*$include[^ ]*[ ]*")";
|
||||
new_stuff_sdk="$new_stuff_sdk $(echo "$stuff_sdk" | grep -oi "[ ]*[^ ]*$include[^ ]*[ ]*")";
|
||||
new_stuff_arch_sdk="$new_stuff_arch_sdk $(echo "$stuff_arch_sdk" | grep -oi "[ ]*[^ ]*$include[^ ]*[ ]*")";
|
||||
done;
|
||||
stuff="$new_stuff";
|
||||
stuff_arch="$new_stuff_arch";
|
||||
stuff_sdk="$new_stuff_sdk";
|
||||
stuff_arch_sdk="$new_stuff_arch_sdk";
|
||||
}
|
||||
|
||||
[ "$excludelist" ] && {
|
||||
new_stuff="$stuff";
|
||||
new_stuff_arch="$stuff_arch";
|
||||
new_stuff_sdk="$stuff_sdk";
|
||||
new_stuff_arch_sdk="$stuff_arch_sdk";
|
||||
for exclude in $excludelist; do
|
||||
log "Including keyword $include";
|
||||
new_stuff="$(echo "$new_stuff" | sed "s|[ ]*[^ ]*$exclude[^ ]*[ ]*| |ig")";
|
||||
new_stuff_arch="$(echo "$new_stuff_arch" | sed "s|[ ]*[^ ]*$exclude[^ ]*[ ]*| |ig")";
|
||||
new_stuff_sdk="$(echo "$new_stuff_sdk" | sed "s|[ ]*[^ ]*$exclude[^ ]*[ ]*| |ig")";
|
||||
new_stuff_arch_sdk="$(echo "$new_stuff_arch_sdk" | sed "s|[ ]*[^ ]*$exclude[^ ]*[ ]*| |ig")";
|
||||
done;
|
||||
stuff="$new_stuff";
|
||||
stuff_arch="$new_stuff_arch";
|
||||
stuff_sdk="$new_stuff_sdk";
|
||||
stuff_arch_sdk="$new_stuff_arch_sdk";
|
||||
}
|
||||
|
||||
[ "$includelist" ] || [ "$excludelist" ] && {
|
||||
stuff="$(echo "$stuff" | sed 's| |\n|g' | tr -s '\n' | sort -u | sed 's|^| |g')
|
||||
";
|
||||
stuff_arch="$(echo "$stuff_arch" | sed 's| |\n|g' | tr -s '\n' | sort -u | sed 's|^| |g')
|
||||
";
|
||||
stuff_sdk="$(echo "$stuff_sdk" | sed 's| |\n|g' | tr -s '\n' | sort -u | sed 's|^| |g')
|
||||
";
|
||||
stuff_arch_sdk="$(echo "$stuff_arch_sdk" | sed 's| |\n|g' | tr -s '\n' | sort -u | sed 's|^| |g')
|
||||
";
|
||||
}
|
||||
|
||||
[ "$stuff" ] || [ "$stuff_arch" ] || [ "$stuff_sdk" ] || [ "$stuff_arch_sdk" ] || abort "Nothing left to install after config";
|
||||
|
||||
}
|
@ -1,52 +0,0 @@
|
||||
# A little bit of copied methods to try to prevent MicroG dirty flash problems
|
||||
# For MinMicroG (FriendlyNeighborhoodShane)
|
||||
|
||||
microg_cleanup() {
|
||||
|
||||
if echo "$stuff" | grep -q "MicroG"; then
|
||||
ui_print " ";
|
||||
ui_print "Doing MicroG preparations...";
|
||||
if [ "$bootmode" != "true" ]; then
|
||||
# Kanged from NanoDroid
|
||||
# Thanks Setialpha
|
||||
cleanup_folders="BlankStore GmsCore GmsCore_update GmsCoreSetupPrebuilt GoogleServicesFramework GsfProxy Phonesky PlayStore PrebuiltGmsCorePi PrebuiltGmsCorePix PrebuiltGmsCore Vending";
|
||||
cleanup_packages="com.android.vending com.google.android.feedback com.google.android.gms com.google.android.gsf com.google.android.gsf.login com.mgoogle.android.gms";
|
||||
for app in $cleanup_folders; do
|
||||
for file in /data/dalvik-cache/*/system"@priv-app@$app"[@\.]*@classes.* /data/dalvik-cache/*/system"@app@$app"[@\.]*@classes.*; do
|
||||
[ -e "$file" ] && { log "PREPPER: Removing $file"; rm -rf "$file"; }
|
||||
done;
|
||||
done;
|
||||
if [ ! -f "$root/system/etc/.mmg" ]; then
|
||||
log "Doing the clean install treatment";
|
||||
for app in $cleanup_packages; do
|
||||
for file in "/data/data/$app" "/data/user/*/$app" "/data/user_de/*/$app" "/data/app/$app"-* "/mnt/asec/$app"-* "/data/media/0/Android/data/$app"; do
|
||||
[ -e "$file" ] && { log "PREPPER: Removing $file"; rm -rf "$file"; }
|
||||
done;
|
||||
done;
|
||||
for file in /data/system/users/*/runtime-permissions.xml; do
|
||||
[ -e "$file" ] && { log "PREPPER: Removing $file"; rm -rf "$file"; }
|
||||
done;
|
||||
if [ -f /data/system/packages.list ]; then
|
||||
for app in $cleanup_packages; do
|
||||
if grep -q "$app" "/data/system/packages.list"; then
|
||||
log "PREPPER: de-registering app: $app";
|
||||
sed -i "s/.*${app}.*//g" /data/system/packages.list;
|
||||
fi;
|
||||
done;
|
||||
else
|
||||
log "PREPPER: This is a clean flash";
|
||||
fi;
|
||||
if [ "$(which sqlite3)" ]; then
|
||||
find /data/system* -type f -name "accounts*db" 2>/dev/null | while read -r database; do
|
||||
log "PREPPER: deleting Google Accounts from $database";
|
||||
sqlite3 "$database" "DELETE FROM accounts WHERE type='com.google';";
|
||||
done
|
||||
else
|
||||
log "PREPPER: sqlite3 not found";
|
||||
fi;
|
||||
fi;
|
||||
touch "$root/system/etc/.mmg";
|
||||
fi;
|
||||
fi;
|
||||
|
||||
}
|
Loading…
Reference in new issue