From 231c878719ebb6bcf644c4892ea38d57c749a5f2 Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Tue, 24 Mar 2020 13:22:46 -0700 Subject: [PATCH] devops: support browser aliases in `export.sh` and `prepare_checkout.sh` (#1520) This lets you use `ff` for `firefox` and `wk` for `webkit` ```sh $ ./browser_patches/prepare_checkout.sh ff ``` --- browser_patches/export.sh | 4 ++-- browser_patches/prepare_checkout.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/browser_patches/export.sh b/browser_patches/export.sh index dc56d0fbfa..0f0b20fa67 100755 --- a/browser_patches/export.sh +++ b/browser_patches/export.sh @@ -37,12 +37,12 @@ fi FRIENDLY_CHECKOUT_PATH=""; CHECKOUT_PATH="" EXPORT_PATH="" -if [[ ("$1" == "firefox") || ("$1" == "firefox/") ]]; then +if [[ ("$1" == "firefox") || ("$1" == "firefox/") || ("$1" == "ff") ]]; then FRIENDLY_CHECKOUT_PATH="//browser_patches/firefox/checkout"; CHECKOUT_PATH="$PWD/firefox/checkout" EXPORT_PATH="$PWD/firefox/" source "./firefox/UPSTREAM_CONFIG.sh" -elif [[ ("$1" == "webkit") || ("$1" == "webkit/") ]]; then +elif [[ ("$1" == "webkit") || ("$1" == "webkit/") || ("$1" == "wk") ]]; then FRIENDLY_CHECKOUT_PATH="//browser_patches/webkit/checkout"; CHECKOUT_PATH="$PWD/webkit/checkout" EXPORT_PATH="$PWD/webkit/" diff --git a/browser_patches/prepare_checkout.sh b/browser_patches/prepare_checkout.sh index 16159225f4..68e150d773 100755 --- a/browser_patches/prepare_checkout.sh +++ b/browser_patches/prepare_checkout.sh @@ -31,13 +31,13 @@ FRIENDLY_CHECKOUT_PATH=""; CHECKOUT_PATH="" PATCHES_PATH="" BUILD_NUMBER="" -if [[ ("$1" == "firefox") || ("$1" == "firefox/") ]]; then +if [[ ("$1" == "firefox") || ("$1" == "firefox/") || ("$1" == "ff") ]]; then FRIENDLY_CHECKOUT_PATH="//browser_patches/firefox/checkout"; CHECKOUT_PATH="$PWD/firefox/checkout" PATCHES_PATH="$PWD/firefox/patches" BUILD_NUMBER=$(cat "$PWD/firefox/BUILD_NUMBER") source "./firefox/UPSTREAM_CONFIG.sh" -elif [[ ("$1" == "webkit") || ("$1" == "webkit/") ]]; then +elif [[ ("$1" == "webkit") || ("$1" == "webkit/") || ("$1" == "wk") ]]; then FRIENDLY_CHECKOUT_PATH="//browser_patches/webkit/checkout"; CHECKOUT_PATH="$PWD/webkit/checkout" PATCHES_PATH="$PWD/webkit/patches"