Update confs

gf-arm64
FriendlyNeighborhoodShane 4 years ago
parent 98d7881631
commit 005806de2f

@ -177,14 +177,14 @@ addona="#!/sbin/sh
save_files() {
cat <<EOF
$(echo $stuff $stuff_arch $stuff_sdk $stuff_arch_sdk $initdfile $addondfile /system/etc/.mmg | sed 's| |\n|g' | sort -u | tr -s '\n')
$(echo "$stuff" "$stuff_arch" "$stuff_sdk" "$stuff_arch_sdk" "$initdfile" "$addondfile" "/system/etc/.mmg" | sed 's| |\n|g' | sort -u | tr -s '\n')
EOF
}
delete_files() {
cat <<EOF
$(echo $stuff_debloat | sed 's| |\n|g' | sort -u | tr -s '\n')
$(echo "$stuff_debloat" | sed 's| |\n|g' | sort -u | tr -s '\n')
EOF
}
@ -325,7 +325,7 @@ user_conf() {
for file in "$(dirname "$0")/mmg-conf.txt" "$(dirname "$zipfile")/mmg-conf.txt" "$moddir/mmg-conf.txt" "/data/adb/mmg-conf.txt"; do
[ -f "$file" ] && {
ui_print " "; ui_print "Processing user config $file...";
includelist="$(cat "$file" | sed -e 's|\#.*||g' -e 's|[^a-zA-Z0-9.-]| |g')";
includelist="$(sed -e 's|\#.*||g' -e 's|[^a-zA-Z0-9.-]| |g' "$file")";
break;
}
done;
@ -361,14 +361,14 @@ user_conf() {
save_files() {
cat <<EOF
$(echo $stuff $stuff_arch $stuff_sdk $stuff_arch_sdk $initdfile $addondfile /system/etc/.mmg | sed 's| |\n|g' | sort -u | tr -s '\n')
$(echo "$stuff" "$stuff_arch" "$stuff_sdk" "$stuff_arch_sdk" "$initdfile" "$addondfile" "/system/etc/.mmg" | sed 's| |\n|g' | sort -u | tr -s '\n')
EOF
}
delete_files() {
cat <<EOF
$(echo $stuff_debloat | sed 's| |\n|g' | sort -u | tr -s '\n')
$(echo "$stuff_debloat" | sed 's| |\n|g' | sort -u | tr -s '\n')
EOF
}
@ -376,13 +376,12 @@ EOF
addond="$addona$addonb";
}
[ "$stuff $stuff_arch $stuff_sdk $stuff_arch_sdk" ] || abort "Nothing left to install after config";
[ "$stuff" ] || [ "$stuff_arch" ] || [ "$stuff_sdk" ] || [ "$stuff_arch_sdk" ] || abort "Nothing left to install after config";
}
microg_cleanup() {
if [ "$(echo "$stuff" | grep MicroG)" ]; then
if echo "$stuff" | grep -q "MicroG"; then
ui_print " ";
ui_print "Doing MicroG preparations...";
if [ "$bootmode" != "true" ]; then
@ -398,7 +397,7 @@ microg_cleanup() {
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
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;
@ -407,7 +406,7 @@ microg_cleanup() {
done;
if [ -f /data/system/packages.list ]; then
for app in $cleanup_packages; do
if [ "$(grep "$app" /data/system/packages.list)" ]; then
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;
@ -416,7 +415,7 @@ microg_cleanup() {
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 database; do
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

@ -183,14 +183,14 @@ addona="#!/sbin/sh
save_files() {
cat <<EOF
$(echo $stuff $stuff_arch $stuff_sdk $stuff_arch_sdk $initdfile $addondfile /system/etc/.mmg | sed 's| |\n|g' | sort -u | tr -s '\n')
$(echo "$stuff" "$stuff_arch" "$stuff_sdk" "$stuff_arch_sdk" "$initdfile" "$addondfile" "/system/etc/.mmg" | sed 's| |\n|g' | sort -u | tr -s '\n')
EOF
}
delete_files() {
cat <<EOF
$(echo $stuff_debloat | sed 's| |\n|g' | sort -u | tr -s '\n')
$(echo "$stuff_debloat" | sed 's| |\n|g' | sort -u | tr -s '\n')
EOF
}
@ -331,7 +331,7 @@ user_conf() {
for file in "$(dirname "$0")/mmg-conf.txt" "$(dirname "$zipfile")/mmg-conf.txt" "$moddir/mmg-conf.txt" "/data/adb/mmg-conf.txt"; do
[ -f "$file" ] && {
ui_print " "; ui_print "Processing user config $file...";
includelist="$(cat "$file" | sed -e 's|\#.*||g' -e 's|[^a-zA-Z0-9.-]| |g')";
includelist="$(sed -e 's|\#.*||g' -e 's|[^a-zA-Z0-9.-]| |g' "$file")";
break;
}
done;
@ -367,14 +367,14 @@ user_conf() {
save_files() {
cat <<EOF
$(echo $stuff $stuff_arch $stuff_sdk $stuff_arch_sdk $initdfile $addondfile /system/etc/.mmg | sed 's| |\n|g' | sort -u | tr -s '\n')
$(echo "$stuff" "$stuff_arch" "$stuff_sdk" "$stuff_arch_sdk" "$initdfile" "$addondfile" "/system/etc/.mmg" | sed 's| |\n|g' | sort -u | tr -s '\n')
EOF
}
delete_files() {
cat <<EOF
$(echo $stuff_debloat | sed 's| |\n|g' | sort -u | tr -s '\n')
$(echo "$stuff_debloat" | sed 's| |\n|g' | sort -u | tr -s '\n')
EOF
}
@ -382,13 +382,12 @@ EOF
addond="$addona$addonb";
}
[ "$stuff $stuff_arch $stuff_sdk $stuff_arch_sdk" ] || abort "Nothing left to install after config";
[ "$stuff" ] || [ "$stuff_arch" ] || [ "$stuff_sdk" ] || [ "$stuff_arch_sdk" ] || abort "Nothing left to install after config";
}
microg_cleanup() {
if [ "$(echo "$stuff" | grep MicroG)" ]; then
if echo "$stuff" | grep -q "MicroG"; then
ui_print " ";
ui_print "Doing MicroG preparations...";
if [ "$bootmode" != "true" ]; then
@ -404,7 +403,7 @@ microg_cleanup() {
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
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;
@ -413,7 +412,7 @@ microg_cleanup() {
done;
if [ -f /data/system/packages.list ]; then
for app in $cleanup_packages; do
if [ "$(grep "$app" /data/system/packages.list)" ]; then
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;
@ -422,7 +421,7 @@ microg_cleanup() {
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 database; do
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

@ -129,14 +129,14 @@ addona="#!/sbin/sh
save_files() {
cat <<EOF
$(echo $stuff $stuff_arch $stuff_sdk $stuff_arch_sdk $initdfile $addondfile /system/etc/.mmg | sed 's| |\n|g' | sort -u | tr -s '\n')
$(echo "$stuff" "$stuff_arch" "$stuff_sdk" "$stuff_arch_sdk" "$initdfile" "$addondfile" "/system/etc/.mmg" | sed 's| |\n|g' | sort -u | tr -s '\n')
EOF
}
delete_files() {
cat <<EOF
$(echo $stuff_debloat | sed 's| |\n|g' | sort -u | tr -s '\n')
$(echo "$stuff_debloat" | sed 's| |\n|g' | sort -u | tr -s '\n')
EOF
}
@ -277,7 +277,7 @@ user_conf() {
for file in "$(dirname "$0")/mmg-conf.txt" "$(dirname "$zipfile")/mmg-conf.txt" "$moddir/mmg-conf.txt" "/data/adb/mmg-conf.txt"; do
[ -f "$file" ] && {
ui_print " "; ui_print "Processing user config $file...";
includelist="$(cat "$file" | sed -e 's|\#.*||g' -e 's|[^a-zA-Z0-9.-]| |g')";
includelist="$(sed -e 's|\#.*||g' -e 's|[^a-zA-Z0-9.-]| |g' "$file")";
break;
}
done;
@ -313,14 +313,14 @@ user_conf() {
save_files() {
cat <<EOF
$(echo $stuff $stuff_arch $stuff_sdk $stuff_arch_sdk $initdfile $addondfile /system/etc/.mmg | sed 's| |\n|g' | sort -u | tr -s '\n')
$(echo "$stuff" "$stuff_arch" "$stuff_sdk" "$stuff_arch_sdk" "$initdfile" "$addondfile" "/system/etc/.mmg" | sed 's| |\n|g' | sort -u | tr -s '\n')
EOF
}
delete_files() {
cat <<EOF
$(echo $stuff_debloat | sed 's| |\n|g' | sort -u | tr -s '\n')
$(echo "$stuff_debloat" | sed 's| |\n|g' | sort -u | tr -s '\n')
EOF
}
@ -328,13 +328,12 @@ EOF
addond="$addona$addonb";
}
[ "$stuff $stuff_arch $stuff_sdk $stuff_arch_sdk" ] || abort "Nothing left to install after config";
[ "$stuff" ] || [ "$stuff_arch" ] || [ "$stuff_sdk" ] || [ "$stuff_arch_sdk" ] || abort "Nothing left to install after config";
}
microg_cleanup() {
if [ "$(echo $stuff | grep MicroG)" ]; then
if echo "$stuff" | grep -q "MicroG"; then
ui_print " ";
ui_print "Doing MicroG preparations...";
if [ "$bootmode" != "true" ]; then
@ -347,12 +346,15 @@ microg_cleanup() {
[ -e "$file" ] && { log "PREPPER: Removing $file"; rm -rf "$file"; }
done;
done;
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"; }
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;
done;
fi;
touch "$root/system/etc/.mmg";
fi;
fi;

Loading…
Cancel
Save