From 050e69d2bc0caad1a442e0be16cd0c4e6ce70f0d Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 29 May 2021 09:10:33 +0000 Subject: [PATCH] fix version, upload script apply patch --- apply-bromite-patches.sh | 24 ++++++++++++++++++++++++ prepare-build.sh | 16 ++++++++-------- 2 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 apply-bromite-patches.sh diff --git a/apply-bromite-patches.sh b/apply-bromite-patches.sh new file mode 100644 index 0000000..5d8649a --- /dev/null +++ b/apply-bromite-patches.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +RED='\033[0;31m' +NC='\033[0m' # No Color + +sudo apt install sed + +cd chromium/src + +echo -e ${RED} ------- apply patchs ${NC} +for file in $(cat ../../bromite/build/bromite_patches_list.txt) ; do + echo -e ${RED} " -> Apply $file" ${NC} + + REPL="0,/^---/s//FILE:"$file"\n---/" + cat ../../bromite/build/patches/$file | sed $REPL | git am + + if [ $? -ne 0 ] + then + echo -e "Error on ../../bromite/build/patches/${file}" + exit 1 + fi + + echo " " +done \ No newline at end of file diff --git a/prepare-build.sh b/prepare-build.sh index 003f1a8..0b8a4e0 100644 --- a/prepare-build.sh +++ b/prepare-build.sh @@ -14,7 +14,7 @@ git fetch git pull VERSION=$( cat ./build/RELEASE ) -echo -e ${RED} -------- lastest version is: $VERSION ${NC} +echo -e ${RED} -------- chromium version is: $VERSION ${NC} echo -e ${RED} -------- cloning depot_tools ${NC} cd .. @@ -29,8 +29,8 @@ echo -e ${RED} -------- set envs ${NC} PATH=$PWD/chromium/src/third_party/llvm-build/Release+Asserts/bin:$PWD/depot_tools/:/usr/local/go/bin:$PATH echo -e ${RED} -------- cheking chromium pre-prepared ${NC} -rm chromium.$VERSION_SHA.tar.gz -lftp $FTP_HOST -u $FTP_USER,$FTP_PWD -e "set ftp:ssl-force true; set ssl:verify-certificate false; cd /bromite; get chromium.$VERSION_SHA.tar.gz; quit" && OK=1 || OK=0 +rm chromium.$VERSION.tar.gz +lftp $FTP_HOST -u $FTP_USER,$FTP_PWD -e "set ftp:ssl-force true; set ssl:verify-certificate false; cd /bromite; get chromium.$VERSION.tar.gz; quit" && OK=1 || OK=0 if [[ OK -eq 0 ]]; then echo -e ${RED} -------- not found ${NC} @@ -83,15 +83,15 @@ if [[ OK -eq 0 ]]; then echo -e ${RED} -------- packing chromium dir ${NC} cd ../.. - tar -czf chromium.$VERSION_SHA.tar.gz ./chromium + tar -czf chromium.$VERSION.tar.gz ./chromium echo -e ${RED} -------- uploading to storage ${NC} - lftp $FTP_HOST -u $FTP_USER,$FTP_PWD -e "set ftp:ssl-force true; set ssl:verify-certificate false; cd /bromite; put chromium.$VERSION_SHA.tar.gz; quit" + lftp $FTP_HOST -u $FTP_USER,$FTP_PWD -e "set ftp:ssl-force true; set ssl:verify-certificate false; cd /bromite; put chromium.$VERSION.tar.gz; quit" else echo -e ${RED} -------- unpacking ${NC} - tar xf chromium.$VERSION_SHA.tar.gz + tar xf chromium.$VERSION.tar.gz fi -rm chromium.$VERSION_SHA.tar.gz -cd chromium/src +rm chromium.$VERSION.tar.gz +