gugelfrei
/
minmicrog
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve confs using shellcheck

Browse Source 
Improve confs using shellcheck
gf-arm64
ShaneTheAwesome 4 years ago
parent 9f5bfd0d2f
commit 89d0d062c3
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File

12
conf/config.txt
Unescape View File

@ -1,15 +1,15 @@
user_conf() {
for dir in "$(dirname "$0")" "$(dirname "$zipfile")" "$moddir" "/data/adb"; do
[ -f "$dir/includelist.txt" -o "$dir/excludelist.txt" ] && {
[ -f "$dir/includelist.txt" ] || [ -f "$dir/excludelist.txt" ] && {
ui_print " ";
[ -f "$dir/includelist.txt" ] && {
if [ -f "$dir/includelist.txt" ]; then
ui_print "Processing include config from $dir...";
includelist="$(cat "$dir/includelist.txt" | sed -e 's|\#.*||g' -e 's/[\#%&\`|*+=!@:;\t$^()?\[\]{}<>]/ /g')";
} || {
else
ui_print "Processing exclude config from $dir...";
excludelist="$(cat "$dir/excludelist.txt" | sed -e 's|\#.*||g' -e 's/[\#%&\`|*+=!@:;\t$^()?\[\]{}<>]/ /g')";
}
fi;
break;
}
done;
@ -50,7 +50,7 @@ user_conf() {
stuff_arch_sdk="$new_stuff_arch_sdk";
}
[ "$includelist" -o "$excludelist" ] && {
[ "$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')
@ -61,6 +61,6 @@ user_conf() {
";
}
[ "$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";
}

14
conf/createwhitelist.txt
Unescape View File

@ -35,7 +35,7 @@ createwhitelist() {
grep -qF "$spoofperm" "$filedir/privlist/AndroidManifest.xml" && hasspoof=true;
od -A n -t x1 "$filedir/privlist/AndroidManifest.xml" | tr -d ' \n' | grep -qF "$spoofpermod" && hasspoof=true;
$hasspoof && echo "android.permission.FAKE_PACKAGE_SIGNATURE" >> "${syslist}" || log "WHITELISTER: No native sigspoof found";
if $hasspoof; then echo "android.permission.FAKE_PACKAGE_SIGNATURE" >> "${syslist}"; else log "WHITELISTER: No native sigspoof found"; fi;
buildlist() {
@ -43,7 +43,7 @@ createwhitelist() {
awk -F \' '/^uses-permission:/{print $2}' | \
sort > "$applist";
[ "$(cat "$applist")" ] || continue;
[ "$(cat "$applist")" ] || return 1;
echo '<?xml version="1.0" encoding="utf-8"?>
<permissions>
@ -68,13 +68,13 @@ createwhitelist() {
/system/priv-app/*/*.apk) ;;
*) continue;;
esac;
for realobject in "$filedir/$object"; do
for realobject in $filedir/$object; do
privobject="$realobject"; break;
done;
[ -f "$privobject" ] || { log "ERROR: $privobject vanished"; continue; }
package="$("$aapt" dump badging "$privobject" | awk -F \' '/^package: name/{print $2}')";
log "WHITELISTER: Building list for $object";
buildlist;
buildlist || continue;
mkdir -p "$filedir/system/etc/permissions/";
mv -f "$permlist" "$filedir/system/etc/permissions/$package.xml";
stuff="$stuff
@ -87,7 +87,7 @@ createwhitelist() {
/system/priv-app/*/*.apk) ;;
*) continue;;
esac;
for realobject in $filedir/$(dirname "$object")/*-$arch-*/$(basename "$object"); do
for realobject in "$filedir/$(dirname "$object")"/*-"$arch"-*/"$(basename "$object")"; do
privobject="$realobject"; break;
done;
[ -f "$privobject" ] || { log "ERROR: $privobject vanished"; continue; }
@ -107,7 +107,7 @@ createwhitelist() {
/system/priv-app/*/*.apk) ;;
*) continue;;
esac;
for realobject in $filedir/$(dirname "$object")/*-$sdk-*/$(basename "$object"); do
for realobject in "$filedir/$(dirname "$object")"/*-"$sdk"-*/"$(basename "$object")"; do
privobject="$realobject"; break;
done;
[ -f "$privobject" ] || { log "ERROR: $privobject vanished"; continue; }
@ -127,7 +127,7 @@ createwhitelist() {
/system/priv-app/*/*.apk) ;;
*) continue;;
esac;
for realobject in $filedir/$(dirname "$object")/*-$arch-*-$sdk-*/$(basename "$object"); do
for realobject in "$filedir/$(dirname "$object")"/*-"$arch"-*-"$sdk"-*/"$(basename "$object")"; do
privobject="$realobject"; break;
done;
[ -f "$privobject" ] || { log "ERROR: $privobject vanished"; continue; }

2
conf/defconf-nogoolag.txt
Unescape View File

@ -355,7 +355,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-*; 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;

2
conf/defconf-standard.txt
Unescape View File

@ -354,7 +354,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-*; 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;

2
conf/defconf-unlp.txt
Unescape View File

@ -310,7 +310,7 @@ microg_cleanup() {
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-*; 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;

8
conf/microgcleanup.txt
Unescape View File

@ -3,7 +3,7 @@
microg_cleanup() {
if [ "$(echo $stuff | grep MicroG)" ]; then
if [ "$(echo "$stuff" | grep MicroG)" ]; then
ui_print " ";
ui_print "Doing MicroG preparations...";
if [ "$bootmode" != "true" ]; then
@ -12,14 +12,14 @@ microg_cleanup() {
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
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
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;
@ -47,7 +47,7 @@ microg_cleanup() {
fi;
touch "$root/system/etc/.mmg";
fi;
if [ "$magisk" == "yes" ]; then
if [ "$magisk" = "yes" ]; then
# Kanged from MagicGapps
# Thanks VR25
for dir in /data/adb/magisk_simple /cache/magisk_mount; do

Write Preview
Loading…
Cancel
Save