summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@digia.com>2013-05-29 17:56:21 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2013-05-31 10:55:54 +0200
commitdd3a2a340c051f7c0ef4e8e79feb27b3de86f147 (patch)
treef5299d386c1eadd520536d4d235b4ee0cec70c40 /patches
parentc9ae723d2f5af25650666cb4a9fc38a49bdd0c0c (diff)
do not update chromium by default.
Diffstat (limited to 'patches')
-rwxr-xr-xpatches/patch-chromium.sh (renamed from patches/update-and-patch-chromium.sh)8
1 files changed, 6 insertions, 2 deletions
diff --git a/patches/update-and-patch-chromium.sh b/patches/patch-chromium.sh
index 1ba39068a..2bbccaa3e 100755
--- a/patches/update-and-patch-chromium.sh
+++ b/patches/patch-chromium.sh
@@ -11,9 +11,13 @@ DEPOT_TOOLS=$CHROMIUM_SRC_DIR/../depot_tools
cd $CHROMIUM_SRC_DIR
echo "Entering $PWD"
-$DEPOT_TOOLS/gclient fetch
+
$DEPOT_TOOLS/gclient revert
-$DEPOT_TOOLS/gclient sync
+
+if [ "$2" = "--update" ]; then
+ $DEPOT_TOOLS/gclient fetch
+ $DEPOT_TOOLS/gclient sync
+fi
echo "Applying patches..."
git am $PATCH_DIR/0001-My-local-fixes.patch