Merge branch 'dev' into dev-stable

Hayao0819 · Hayao0819 · commit 7e634586e92e · 2020-05-24T21:46:26.000+09:00
diff --git a/keyring.sh b/keyring.sh
@@ -180,6 +180,8 @@ update_arch_key() {
     pacman-key --init
     pacman-key --populate archlinux
     pacman -S --noconfirm  core/archlinux-keyring
+    pacman-key --init
+    pacman-key --populate archlinux
     pacman -Sy
 }
 

Original file line number	Diff line number	Diff line change
`@@ -180,6 +180,8 @@ update_arch_key() {`
`180`	`180`	`pacman-key --init`
`181`	`181`	`pacman-key --populate archlinux`
`182`	`182`	`pacman -S --noconfirm core/archlinux-keyring`
	`183`	`+ pacman-key --init`
	`184`	`+ pacman-key --populate archlinux`
`183`	`185`	`pacman -Sy`
`184`	`186`	`}`
`185`	`187`