Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b277de7 authored by Jackeagle's avatar Jackeagle
Browse files

Merge branch 'master-recovery-no-flag' into 'master'

build: If no recovery flag is given, rename recovery file in generic format

See merge request !80
parents 8e712929 6c4e7288
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -389,11 +389,11 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
                mv "$RECOVERY_ZIP_NAME"* "$ZIP_DIR/$zipsubdir/"
            else
                if [ "$VBOOT_IS_RECOVERY" = true ]; then
                    cp -a "obj/PACKAGING/target_files_intermediates/lineage_*/IMAGES/vendor_boot.img" "$RECOVERY_IMG_NAME"
                    cp -a obj/PACKAGING/target_files_intermediates/lineage_*/IMAGES/vendor_boot.img "$RECOVERY_IMG_NAME"
                elif [ -f "recovery.img" ]; then
                    RECOVERY_IMG_NAME="recovery.img"
                    cp -a recovery.img "$RECOVERY_IMG_NAME"
                else
                    RECOVERY_IMG_NAME="boot.img"
                    cp -a boot.img "$RECOVERY_IMG_NAME"
                fi

                # Calculate sha256sum and move file
@@ -478,4 +478,3 @@ fi
if [ "$build_successful" = false ] || [ "$sync_successful" = false ]; then
  exit 1
fi