Remove Chrome repo erroneously added by brave-browser (brave-browser#…

…2927)
brave · Feb 20, 2019 · 5827f29 · 5827f29
1 parent 18b8db6
commit 5827f29
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/patches/chrome-installer-linux-common-repo.cron.patch b/patches/chrome-installer-linux-common-repo.cron.patch
@@ -1,11 +1,20 @@
 diff --git a/chrome/installer/linux/common/repo.cron b/chrome/installer/linux/common/repo.cron
-index 2750e4924da6d0a723c1d649781637e7d08b3562..fbe7797e37633de174f4a83d7b11bf04b8813c1a 100755
+index 2750e4924da6d0a723c1d649781637e7d08b3562..2b9a3f3591a93a033a93e201b2b1a1d13ebbecd4 100755
 --- a/chrome/installer/linux/common/repo.cron
 +++ b/chrome/installer/linux/common/repo.cron
-@@ -17,6 +17,9 @@
+@@ -17,6 +17,18 @@
  # "false" as desired. An empty $DEFAULTS_FILE is the same as setting both values
  # to "false".
 
++# Remove Chrome repo if erroneously added (brave/brave-browser#2927)
++if [ -e "/etc/apt/sources.list.d/@@PACKAGE@@.list" ] ; then
++  if [ ! -e "/etc/apt/sources.list.d/google-chrome.list" -a ! -e "/etc/apt/sources.list.d/google-chrome-beta.list" -a ! -e "/etc/apt/sources.list.d/google-chrome-unstable.list" ] ; then
++    apt-key del D38B4796
++  fi
++  rm -f "/etc/default/@@PACKAGE@@"
++  rm "/etc/apt/sources.list.d/@@PACKAGE@@.list"
++fi
++
 +# Don't add the Chrome repo (brave/brave-browser#1084)
 +exit 0
 +

diff --git a/patches/chrome-installer-linux-common-rpmrepo.cron.patch b/patches/chrome-installer-linux-common-rpmrepo.cron.patch
@@ -1,11 +1,20 @@
 diff --git a/chrome/installer/linux/common/rpmrepo.cron b/chrome/installer/linux/common/rpmrepo.cron
-index f7fe2bcf7d7cbf95b23067f21f87422706c5e4d0..3541826a03009e2adb8dbd6c258d254d31247a77 100755
+index f7fe2bcf7d7cbf95b23067f21f87422706c5e4d0..3dbad7d3a412efb023f3d57707fe6723d5a78e66 100755
 --- a/chrome/installer/linux/common/rpmrepo.cron
 +++ b/chrome/installer/linux/common/rpmrepo.cron
-@@ -14,6 +14,9 @@
+@@ -14,6 +14,18 @@
  # setting "repo_add_once" to "true" or "false" as desired. An empty
  # $DEFAULTS_FILE is the same as setting the value to "false".
 
++# Remove Chrome repo if erroneously added (brave/brave-browser#2927)
++if [ -e "/etc/yum.repos.d/@@PACKAGE@@.repo" ] ; then
++  if [ ! -e "/etc/yum.repos.d/google-chrome.repo" -a ! -e "/etc/yum.repos.d/google-chrome-beta.repo" -a ! -e "/etc/yum.repos.d/google-chrome-unstable.repo" ] ; then
++    rpm -e gpg-pubkey-7fac5991-4615767f
++    rpm -e gpg-pubkey-d38b4796-570c8cd3
++  fi
++  rm "/etc/yum.repos.d/@@PACKAGE@@.repo"
++fi
++
 +# Don't add the Chrome repo (brave/brave-browser#1967)
 +exit 0
 +