diff --git a/PrebuiltApps b/PrebuiltApps index 85565adb..d205a9ab 160000 --- a/PrebuiltApps +++ b/PrebuiltApps @@ -1 +1 @@ -Subproject commit 85565adbc051a59bb0da8a138456d4f2a06d8296 +Subproject commit d205a9abc259baf4c912119ecec9e73508d4ae48 diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index d5e0cb74..1236cffe 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -46,6 +46,23 @@ gitReset() { } export -f gitReset; +gpgVerifyDirectory() { + if [ -r "$HOME/.gnupg" ]; then + for sig in $1/*.asc; do + gpg --verify $sig &>/dev/null; + if [ "$?" -eq "0" ]; then + echo -e "\e[0;32mGPG Verified Successfully: $sig\e[0m"; + else + echo -e "\e[0;31mWARNING: GPG Verification Failed: $sig\e[0m"; + sleep 60; + fi; + done; + else + echo -e "\e[0;33mWARNING: ~/.gnupg is unavailable, GPG verification of $1 will not be performed!\e[0m"; + fi; +} +export -f gpgVerifyDirectory; + scanForMalware() { if [ -x /usr/bin/clamscan ] && [ -r /var/lib/clamav/main.cvd ]; then echo -e "\e[0;32mStarting a malware scan...\e[0m"; diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 1755c9ab..1a12fb64 100755 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -58,6 +58,7 @@ echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/a #top dir cp -r "$DOS_PREBUILT_APPS""Fennec_DOS-Shim" "$DOS_BUILD_BASE""packages/apps/"; #Add a shim to install Fennec DOS without actually including the large APK +gpgVerifyDirectory "$DOS_PREBUILT_APPS""android_vendor_FDroid_PrebuiltApps/packages"; cp -r "$DOS_PREBUILT_APPS""android_vendor_FDroid_PrebuiltApps/." "$DOS_BUILD_BASE""vendor/fdroid_prebuilt/"; #Add the prebuilt apps cp -r "$DOS_PATCHES_COMMON""android_vendor_divested/." "$DOS_BUILD_BASE""vendor/divested/"; #Add our vendor files diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index 3393a852..40590ddf 100755 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -58,6 +58,7 @@ echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/a #top dir cp -r "$DOS_PREBUILT_APPS""Fennec_DOS-Shim" "$DOS_BUILD_BASE""packages/apps/"; #Add a shim to install Fennec DOS without actually including the large APK +gpgVerifyDirectory "$DOS_PREBUILT_APPS""android_vendor_FDroid_PrebuiltApps/packages"; cp -r "$DOS_PREBUILT_APPS""android_vendor_FDroid_PrebuiltApps/." "$DOS_BUILD_BASE""vendor/fdroid_prebuilt/"; #Add the prebuilt apps cp -r "$DOS_PATCHES_COMMON""android_vendor_divested/." "$DOS_BUILD_BASE""vendor/divested/"; #Add our vendor files