Uplift of #4995 (squashed) to beta

brave · Mar 23, 2020 · 1ecf156 · 1ecf156
1 parent 2836faa
commit 1ecf156
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/script/upload_to_rpm_repo b/script/upload_to_rpm_repo
@@ -39,14 +39,19 @@ fi
 case "$GPG_KEY_ID" in
     "D8BAD4DE7EE17AF52A834B2D0BB75829C2D4E821"|"9BD198A2D848C482E3550697A8580BDC82D3DC6C"|"E85FFA8E2E90B40B33ED39274FE13824E3FFC656")  # Release keys
         KEY_NAME=brave-core.asc
-        for pubkey in $(rpm -q gpg-pubkey --qf '%{NAME}-%{VERSION}-%{RELEASE}\t%{SUMMARY}\n'|grep Brave|awk '{ print $1 }'); do
+        for pubkey in $(rpm -q gpg-pubkey --qf '%{NAME}-%{VERSION}-%{RELEASE}\t%{SUMMARY}\n'|grep "Brave Software <[email protected]>"|awk '{ print $1 }'); do
           sudo rpm -e $pubkey
         done
         gpg --export --armor "${GPG_KEY_ID}!" > $KEY_NAME
         sudo rpm --import $KEY_NAME
         ;;
     "9228DBCE20DDE5EC46488DE90B31DBA06A8A26F9") # Nightly key
         KEY_NAME=brave-core-nightly.asc
+        for pubkey in $(rpm -q gpg-pubkey --qf '%{NAME}-%{VERSION}-%{RELEASE}\t%{SUMMARY}\n'|grep "Brave Core Nightly Key"|awk '{ print $1 }'); do
+          sudo rpm -e $pubkey
+        done
+        gpg --export --armor "${GPG_KEY_ID}!" > $KEY_NAME
+        sudo rpm --import $KEY_NAME
         ;;
     *)
         echo "Error! Unknown key passed in. Bailing out."