Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-10-01 01:35:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix GPG signing

Browse Source
This commit is contained in:
Tad 2020-06-27 01:45:02 -04:00
parent 2ef92046af
commit d9a61e1dea
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Patches/Linux

@ -1 +1 @@
Subproject commit dcbf3465dbd96f5a700d185ab2fa3c9aadf412d2 Subproject commit c204a21b1e0e307b73ceaf4f72ab84df0979d014

3
Scripts/Common/Deblob.sh
View File

@ -327,8 +327,7 @@ echo "Deblobbing..."
#blobs=$blobs"|dbvc_atvc_property_set"; #blobs=$blobs"|dbvc_atvc_property_set";
blobs=$blobs"|com.motorola.motosignature.jar|com.motorola.motosignature.xml|MotoSignatureApp.apk"; blobs=$blobs"|com.motorola.motosignature.jar|com.motorola.motosignature.xml|MotoSignatureApp.apk";
blobs=$blobs"|TriggerEnroll.apk|TriggerTrainingService.apk|com.motorola.triggerenroll.xml"; blobs=$blobs"|TriggerEnroll.apk|TriggerTrainingService.apk|com.motorola.triggerenroll.xml";
blobs=$blobs"|audio.motvr.default.so"; blobs=$blobs"|audio.motvr.default.so|libmotaudioutils.so";
#blobs=$blobs"|libmotaudioutils.so"; #breaks phone call audio
blobs=$blobs"|libcce-socketjni.so|libmotocare.so"; blobs=$blobs"|libcce-socketjni.so|libmotocare.so";
#blobs=$blobs"|qmi_motext_hook|libmdmcutback.so|libqmimotext.so|libmotext_inf.so"; #necessary for radio #blobs=$blobs"|qmi_motext_hook|libmdmcutback.so|libqmimotext.so|libmotext_inf.so"; #necessary for radio
makes=$makes"|com.motorola.cameraone.xml"; makes=$makes"|com.motorola.cameraone.xml";

13
Scripts/Common/Functions.sh
View File

@ -177,7 +177,7 @@ processRelease() {
#Malware Scan #Malware Scan
if [ "$DOS_MALWARE_SCAN_BEFORE_SIGN" = true ]; then if [ "$DOS_MALWARE_SCAN_BEFORE_SIGN" = true ]; then
echo -e "\e[0;32mScanning files for malware before signing\e[0m"; echo -e "\e[0;32mScanning files for malware before signing\e[0m";
scanForMalware false "$OUT_DIR/system"; scanForMalware false "$OUT_DIR/obj/PACKAGING/target_files_intermediates/*$DEVICE-target_files-*.zip";
fi; fi;
#Target Files #Target Files
@ -243,7 +243,10 @@ processRelease() {
# sha512sum $OUT_DIR/$PREFIX-boot.img > $OUT_DIR/$PREFIX-boot.img.sha512sum; # sha512sum $OUT_DIR/$PREFIX-boot.img > $OUT_DIR/$PREFIX-boot.img.sha512sum;
fi; fi;
#File name fixes
sed -i "s|$OUT_DIR/||" $OUT_DIR/*.md5sum $OUT_DIR/*.sha512sum; sed -i "s|$OUT_DIR/||" $OUT_DIR/*.md5sum $OUT_DIR/*.sha512sum;
sed -i 's/-ota\././' $OUT_DIR/*.md5sum $OUT_DIR/*.sha512sum;
sed -i 's/-incremental_/-/' $OUT_DIR/*.md5sum $OUT_DIR/*.sha512sum;
#GPG signing #GPG signing
if [ "$DOS_GPG_SIGNING" = true ]; then if [ "$DOS_GPG_SIGNING" = true ]; then
@ -269,6 +272,9 @@ processRelease() {
cp -v $OUT_DIR/$PREFIX-ota.zip* $ARCHIVE/; cp -v $OUT_DIR/$PREFIX-ota.zip* $ARCHIVE/;
cp -v $OUT_DIR/$PREFIX-incremental_*.zip* $ARCHIVE/incrementals/ || true; cp -v $OUT_DIR/$PREFIX-incremental_*.zip* $ARCHIVE/incrementals/ || true;
cp -v $OUT_DIR/$PREFIX-recovery.img* $ARCHIVE/ || true; cp -v $OUT_DIR/$PREFIX-recovery.img* $ARCHIVE/ || true;
rename -- "-ota." "." $ARCHIVE/$PREFIX-ota.zip*;
rename -- "-incremental_" "-" $ARCHIVE/incrementals/$PREFIX-incremental_*.zip*;
sync; sync;
#Remove to make space for next build #Remove to make space for next build
@ -285,11 +291,6 @@ processRelease() {
export -f processRelease; export -f processRelease;
pushToServer() { pushToServer() {
rename -- "-ota." "." *zip*;
rename -- "-incremental_" "-" incrementals/*zip*;
sed -i 's/-ota\././' *.md5sum *.sha512sum;
sed -i 's/-incremental_/-/' incrementals/*.md5sum incrementals/*.sha512sum;
rsync -Pau incrementals/divested-*-dos-$1-*.zip* root@divestos.org:/var/www/divestos.org/builds/LineageOS/$1/incrementals/ || true; rsync -Pau incrementals/divested-*-dos-$1-*.zip* root@divestos.org:/var/www/divestos.org/builds/LineageOS/$1/incrementals/ || true;
rsync -Pau divested-*-dos-$1.zip* root@divestos.org:/var/www/divestos.org/builds/LineageOS/$1/ || true; rsync -Pau divested-*-dos-$1.zip* root@divestos.org:/var/www/divestos.org/builds/LineageOS/$1/ || true;
rsync -Pau divested-*-dos-$1-recovery.img root@divestos.org:/var/www/divestos.org/builds/LineageOS/$1/ || true; rsync -Pau divested-*-dos-$1-recovery.img root@divestos.org:/var/www/divestos.org/builds/LineageOS/$1/ || true;