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

Commit 6f754523 authored by Arnau Vàzquez's avatar Arnau Vàzquez
Browse files

Merge branch 'master' into 'production' 

Deploy zirconia fix to production

See merge request !53
parents 009f8e52 b491bf62

src/Helpers/Build.php

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ 


            $ret = false;



            if ($params['device'] == $this->model) {

            if ($params['device'] == $this->model || $params['device'] === "2e" && $this->model === "zirconia") {

                if (count($params['channels']) > 0) {

                    foreach ($params['channels'] as $channel) {

                        if (strtolower($channel) == $this->channel) {

src/Helpers/Builds.php

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ 
                foreach ($files as $file) {

                    // Skip all files except for the ones that match the pattern

                    // filename starting with e- and ending with .zip are considered as valid files

                    if (!preg_match("/^e-[0-9\.]+-(.*)-$device\.zip$/i", $file)) {

                    if (!preg_match("/^e-[0-9\.]+-(.*)-$device\.zip$/i", $file) && !($device === "2e" && preg_match("/^e-[0-9\.]+-(.*)-zirconia\.zip$/i", $file))) {

                        continue;

                    }

                    $build = null;