Run shellcheck on confs

gf-arm64
FriendlyNeighborhoodShane 4 years ago
parent 52220f6818
commit 98d7881631

@ -5,10 +5,10 @@ user_conf() {
ui_print " ";
if [ -f "$dir/includelist.txt" ]; then
ui_print "Processing include config from $dir...";
includelist="$(cat "$dir/includelist.txt" | sed -e 's|\#.*||g' -e 's|[^a-zA-Z0-9.-]| |g')";
includelist="$(sed -e 's|\#.*||g' -e 's|[^a-zA-Z0-9.-]| |g' "$dir/includelist.txt")";
else
ui_print "Processing exclude config from $dir...";
excludelist="$(cat "$dir/excludelist.txt" | sed -e 's|\#.*||g' -e 's|[^a-zA-Z0-9.-]| |g')";
excludelist="$(sed -e 's|\#.*||g' -e 's|[^a-zA-Z0-9.-]| |g' "$dir/excludelist.txt")";
fi;
break;
}

@ -3,7 +3,7 @@
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
@ -19,7 +19,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;
@ -28,7 +28,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;
@ -37,7 +37,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

@ -97,14 +97,14 @@ updatedelta() {
newlog=""
oldlogs=""
for log in $(ls -t $reldir/update-*.log); do
for log in "$reldir"/update-*.log; do
[ "$newlog" ] && oldlogs="$oldlogs $(basename "$log")" || newlog="$(basename "$log")";
done;
[ "$oldlogs" ] || { echo " -- No old logs to compare"; return 0; }
for entry in $(cat "$reldir/$newlog" | grep -Po "FILE: [^,;]*" | cut -d" " -f2); do
for entry in $(grep -Po "FILE: [^,;]*" "$reldir/$newlog" | cut -d" " -f2); do
line="$(grep "FILE: $entry," "$reldir/$newlog")";
file="$entry";
url="$(echo $line | grep -Po "URL: [^,;]*" | cut -d" " -f2)";
url="$(echo "$line" | grep -Po "URL: [^,;]*" | cut -d" " -f2)";
oldurl="";
for log in $oldlogs; do
oldurl="$(grep "FILE: $file," "$reldir/$log" | grep -Po "URL: [^,;]*" | cut -d" " -f2)";
@ -115,8 +115,8 @@ updatedelta() {
echo " -- Updated file: $file"
echo " ++ Old URL: $oldurl"
echo " ++ New URL: $url"
echo " ++ Old name: $(basename $oldurl)"
echo " ++ New name: $(basename $url)"
echo " ++ Old name: $(basename "$oldurl")"
echo " ++ New name: $(basename "$url")"
done;
}
@ -197,7 +197,7 @@ checkwhitelist() {
for line in $lines; do
[ "$startline" ] && endline="$line" || startline="$line";
done;
cat "$tmpdir/tmppage" | tail -n+"$(($startline + 1))" | head -n"$(($endline - $startline - 1))" | tr -d "\n" | sed "s|<div data|\n|g" | grep "Not for use by third-party applications" | grep -oE "android.permission.[A-Z_]*" > "$tmpdir/tmplist";
tail -n+"$(( startline + 1 ))" "$tmpdir/tmppage" | head -n"$(( endline - startline - 1 ))" | tr -d "\n" | sed "s|<div data|\n|g" | grep "Not for use by third-party applications" | grep -oE "android.permission.[A-Z_]*" > "$tmpdir/tmplist";
echo "android.permission.FAKE_PACKAGE_SIGNATURE" >> "$tmpdir/tmplist";
cat "$resdldir/$privpermlist" "$tmpdir/tmplist" 2>/dev/null | sort -u > "$tmpdir/sortedlist";

Loading…
Cancel
Save