diff --git a/infra/set_exec.sh b/infra/set_exec.sh index d683f326..4fef710a 100755 --- a/infra/set_exec.sh +++ b/infra/set_exec.sh @@ -45,6 +45,8 @@ sudo chmod -v +x package.sh && sudo chmod -v +x trunk.sh && +sudo chmod -v +x tot.sh && + sudo chmod -v +x reset_depot_tools.sh && sudo chmod -v +x version.sh && diff --git a/tot.sh b/tot.sh new file mode 100755 index 00000000..3dc1c189 --- /dev/null +++ b/tot.sh @@ -0,0 +1,79 @@ +#!/bin/bash + +# Copyright (c) 2024 Alex313031. + +YEL='\033[1;33m' # Yellow +CYA='\033[1;96m' # Cyan +RED='\033[1;31m' # Red +GRE='\033[1;32m' # Green +c0='\033[0m' # Reset Text +bold='\033[1m' # Bold Text +underline='\033[4m' # Underline Text + +# Error handling +yell() { echo "$0: $*" >&2; } +die() { yell "$*"; exit 111; } +try() { "$@" || die "${RED}Failed $*"; } + +# --help +displayHelp () { + printf "\n" && + printf "${bold}${GRE}Script to Rebase/Sync Chromium repo.${c0}\n" && + # printf "${bold}${YEL}Use the --shallow flag to do a shallow sync, if you have downloaded${c0}\n" && + # printf "${bold}${YEL}the Chromium repo with the --no-history flag.${c0}\n" && + printf "\n" +} +case $1 in + --help) displayHelp; exit 0;; +esac + +# chromium/src dir env variable +if [ -z "${CR_DIR}" ]; then + CR_SRC_DIR="$HOME/chromium/src" + export CR_SRC_DIR +else + CR_SRC_DIR="${CR_DIR}" + export CR_SRC_DIR +fi + +printf "\n" && +printf "${bold}${GRE}Script to Rebase/Sync Chromium repo.${c0}\n" && +printf "\n" && +printf "${YEL}Rebasing/Syncing and running hooks...\n" && +tput sgr0 && + +cd ${CR_SRC_DIR}/v8/ && + +git restore . && git clean -ffd && + +cd ${CR_SRC_DIR}/third_party/devtools-frontend/src && + +git restore . && git clean -ffd && + +cd ${CR_SRC_DIR}/third_party/ffmpeg && + +git restore . && git clean -ffd && + +cd ${CR_SRC_DIR} && + +rm -v -r -f ${CR_SRC_DIR}/third_party/pak && + +git checkout -f origin/main && + +git clean -ffd && +git clean -ffd && + +git rebase-update && + +git fetch --tags && + +gclient sync --with_branch_heads --with_tags -f -R -D && + +git clean -ffd && + +gclient runhooks && + +printf "\n" && +printf "${GRE}Done!" && +printf "\n" && +tput sgr0 diff --git a/trunk.sh b/trunk.sh index 79ce113c..4321a65d 100755 --- a/trunk.sh +++ b/trunk.sh @@ -18,9 +18,9 @@ try() { "$@" || die "${RED}Failed $*"; } # --help displayHelp () { printf "\n" && - printf "${bold}${GRE}Script to Rebase/Sync Chromium repo on Linux.${c0}\n" && - printf "${bold}${YEL}Use the --shallow flag to do a shallow sync, if you have downloaded${c0}\n" && - printf "${bold}${YEL}the Chromium repo with the --no-history flag.${c0}\n" && + printf "${bold}${GRE}Script to Rebase/Sync Chromium repo.${c0}\n" && + # printf "${bold}${YEL}Use the --shallow flag to do a shallow sync, if you have downloaded${c0}\n" && + # printf "${bold}${YEL}the Chromium repo with the --no-history flag.${c0}\n" && printf "\n" } case $1 in @@ -37,22 +37,22 @@ else fi printf "\n" && -printf "${bold}${GRE}Script to Rebase/Sync Chromium repo on Linux.${c0}\n" && +printf "${bold}${GRE}Script to Rebase/Sync Chromium repo.${c0}\n" && printf "\n" && printf "${YEL}Rebasing/Syncing and running hooks...\n" && tput sgr0 && cd ${CR_SRC_DIR}/v8/ && -git checkout -f origin/main && +git restore . && git clean -ffd && cd ${CR_SRC_DIR}/third_party/devtools-frontend/src && -git checkout -f origin/main && +git restore . && git clean -ffd && cd ${CR_SRC_DIR}/third_party/ffmpeg && -git checkout -f origin/master && +git restore . && git clean -ffd && cd ${CR_SRC_DIR} &&